pms 瑞都 平台井 关联的属性字段回显

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/vo/IotProjectTaskPlatformVO.java

@@ -1,9 +1,13 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotprojecttask.vo;
 
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttaskattrs.IotTaskAttrModelProperty;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+import java.util.Set;
+
 @Schema(description = "管理后台 - 项目任务 平台井 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -20,4 +24,13 @@ public class IotProjectTaskPlatformVO {
 
     @Schema(description = "日报id", example = "314")
     private Long reportId;
+
+    @Schema(description = "当前平台关联井已经选择的扩展属性值")
+    private List<IotTaskAttrModelProperty> extProperty;
+
+    @Schema(description = "当前平台关联井已经选择的施工工艺")
+    private Set<Long> techniqueIds;
+
+    @Schema(description = "任务状态", example = "sg")
+    private String rdStatus;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreport/IotRdDailyReportController.java

@@ -222,10 +222,21 @@ public class IotRdDailyReportController {
             IotRdDailyReportPageReqVO reportReqVO  = new IotRdDailyReportPageReqVO();
             reportReqVO.setPlatformGroup(dailyReport.getPlatformGroup());
             List<IotRdDailyReportDO> reports = iotRdDailyReportService.dailyReports(reportReqVO);
+            // key任务id  value日报id
             Map<Long, Long> reportPair = new HashMap<>();
+            // key任务id  value平台井日报已经设置的多种属性
+            Map<Long, IotProjectTaskPlatformVO> platformPair = new HashMap<>();
             if (CollUtil.isNotEmpty(reports)) {
                 reports.forEach(report -> {
+                    // 保养平台井关联的多个日报使用
                     reportPair.put(report.getTaskId(), report.getId());
+                    // 设置 平台关联井 已经设置的 属性 施工状态 施工工艺 工作量属性
+                    // 查询 平台关联井详情使用
+                    IotProjectTaskPlatformVO platformVO = new IotProjectTaskPlatformVO();
+                    platformVO.setRdStatus(report.getRdStatus());
+                    platformVO.setTechniqueIds(report.getTechniqueIds());
+                    platformVO.setExtProperty(report.getExtProperty());
+                    platformPair.put(report.getTaskId(), platformVO);
                 });
             }
             List<IotProjectTaskPlatformVO> platforms = new ArrayList<>();
@@ -238,6 +249,12 @@ public class IotRdDailyReportController {
                     if (reportPair.containsKey(task.getId())) {
                         platform.setReportId(reportPair.get(task.getId()));
                     }
+                    if (platformPair.containsKey(task.getId())) {
+                        IotProjectTaskPlatformVO tempPlatform = platformPair.get(task.getId());
+                        platform.setRdStatus(tempPlatform.getRdStatus());
+                        platform.setTechniqueIds(tempPlatform.getTechniqueIds());
+                        platform.setExtProperty(tempPlatform.getExtProperty());
+                    }
                     platforms.add(platform);
                 });
                 dailyReportVO.setPlatforms(platforms);