pms 瑞都日报 虚拟项目

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

@@ -171,6 +171,8 @@ public class IotRdDailyReportController {
             dailyReportVO.setContractName(project.getContractName());
             dailyReportVO.setManufactureName(project.getManufactureName());
             dailyReportVO.setCompanyId(project.getDeptId());
+            // 虚拟项目标识
+            dailyReportVO.setVirtualProject(project.getContractSubject());
         }
         // 查询日报对应的任务信息
         if (ObjUtil.isNotEmpty(dailyReport.getTaskId())) {
@@ -279,22 +281,23 @@ public class IotRdDailyReportController {
             List<IotProjectTaskPlatformVO> platforms = new ArrayList<>();
             if (CollUtil.isNotEmpty(tasks)) {
                 tasks.forEach(task -> {
-                    IotProjectTaskPlatformVO platform = new IotProjectTaskPlatformVO();
-                    platform.setId(task.getId());
-                    platform.setWellName(task.getWellName());
-                    platform.setWorkloadDesign(task.getWorkloadDesign());
+                    // 只有生成了主井关联井日报才能在查询平台井详情直接列表中出现
                     if (reportPair.containsKey(task.getId())) {
+                        IotProjectTaskPlatformVO platform = new IotProjectTaskPlatformVO();
+                        platform.setId(task.getId());
+                        platform.setWellName(task.getWellName());
+                        platform.setWorkloadDesign(task.getWorkloadDesign());
                         platform.setReportId(reportPair.get(task.getId()));
+                        if (platformPair.containsKey(task.getId())) {
+                            IotProjectTaskPlatformVO tempPlatform = platformPair.get(task.getId());
+                            platform.setRdStatus(tempPlatform.getRdStatus());
+                            platform.setRdStatusLabel(tempPlatform.getRdStatusLabel());
+                            platform.setTechniqueIds(tempPlatform.getTechniqueIds());
+                            platform.setTechniqueNames(tempPlatform.getTechniqueNames());
+                            platform.setExtProperty(tempPlatform.getExtProperty());
+                        }
+                        platforms.add(platform);
                     }
-                    if (platformPair.containsKey(task.getId())) {
-                        IotProjectTaskPlatformVO tempPlatform = platformPair.get(task.getId());
-                        platform.setRdStatus(tempPlatform.getRdStatus());
-                        platform.setRdStatusLabel(tempPlatform.getRdStatusLabel());
-                        platform.setTechniqueIds(tempPlatform.getTechniqueIds());
-                        platform.setTechniqueNames(tempPlatform.getTechniqueNames());
-                        platform.setExtProperty(tempPlatform.getExtProperty());
-                    }
-                    platforms.add(platform);
                 });
                 dailyReportVO.setPlatforms(platforms);
             }

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

@@ -290,4 +290,7 @@ public class IotRdDailyReportRespVO {
     @Schema(description = "平台井列表", example = "[]")
     @ExcelProperty("平台井列表")
     private List<IotProjectTaskPlatformVO> platforms;
+
+    @Schema(description = "虚拟项目标识", example = "Y N")
+    private String virtualProject;
 }