pms 瑞鹰 煤气层任务 生成日报 taskId projectId

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/dailyreport/CreateRyDailyReportOrderJob.java

@@ -171,9 +171,10 @@ public class CreateRyDailyReportOrderJob implements JobHandler {
             // 查询这些部门对象集合
             Map<Long, DeptDO> deptMap = deptService.getDeptMap(tobeReportXjDeptIds);
 
-            // 查询这些部门所有的项目任务
+            // 查询这些部门所有的项目任务 筛选未完工的任务
             IotProjectTaskPageReqVO taskReqVO = new IotProjectTaskPageReqVO();
             taskReqVO.setCompanyId(158l);
+            taskReqVO.setJobFlag("Y");
             List<IotProjectTaskDO> tasks = iotProjectTaskService.projectTasks(taskReqVO);
             Map<Long, Set<Long>> taskDeptPair = new HashMap<>();
             // key任务id   value项目id
@@ -223,9 +224,10 @@ public class CreateRyDailyReportOrderJob implements JobHandler {
                     taskDeptPair.forEach((taskId, deptIds) -> {
                         if (deptIds.contains(tobeReportXjDeptId)) {
                             noDeviceReport.setTaskId(taskId);
-                        }
-                        if (taskProjectPair.containsKey(taskId)) {
-                            noDeviceReport.setProjectId(taskProjectPair.get(taskId));
+                            // 设置任务对应的项目信息
+                            if (taskProjectPair.containsKey(taskId)) {
+                                noDeviceReport.setProjectId(taskProjectPair.get(taskId));
+                            }
                         }
                     });
                 }