优化跨天待办任务待办列表处理逻辑

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -813,7 +813,7 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         for (HisTasksResponseDTO hisTasksRespons : hisTasksResponseDTOS) {
             String taskName = hisTasksRespons.getTaskName();
             Map<String, Object> vars = hisTasksRespons.getVars();
-            //把相同名称的节点且不是驳回vars复制给新的
+            //把相同名称的节点且不是驳回vars复制给新的(只获取不是驳回节点的参数)
             if (taskName != null && taskName.contains("安全许可证") && !taskName.contains("安全许可证申请")) {
                 if (vars == null) {
                     List<HisTasksResponse> collect = hisTasksResponses.stream()
@@ -911,16 +911,24 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         List<TodoTask> resultList = queryList.getRecords();
         List<TodoTaskDTO> todoTaskDTOS = BeanConverUtil.converList(resultList, TodoTaskDTO.class);
         todoTaskDTOS.forEach((task) -> {
-            //String processDefinitionId = task.getProcessDefinitionId();
-            //如果是跨天待办
-            //if (processDefinitionId.contains("hazardousWorkDailyCheck")){
-            //    HisTasksRequest hisTasksRequest = new HisTasksRequest();
-            //    hisTasksRequest.setProcessInstanceId(task.getProcessInstanceId());
-            //    List<HisTasksResponseDTO> collect = getHistoryByInstanceId(hisTasksRequest, task.getBizId()).stream().filter(hisTask -> hisTask.getTaskId().equals(task.getTaskId())).collect(Collectors.toList());
-            //}
+
             task.setAssigned(StringHelper.isBlank(task.getAssignee()) ? "0" : "1");
             task.setProcessInstanceSuspended(((ProcessInstance) this.runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult()).isSuspended());
             THazardWorkPlanDTO detailsById = this.getDetailsById(task.getBizId());
+
+            String processDefinitionId = task.getProcessDefinitionId();
+            //如果是跨天待办
+            if (processDefinitionId.contains("hazardousWorkDailyCheck")){
+                HisTasksRequest hisTasksRequest = new HisTasksRequest();
+                hisTasksRequest.setProcessInstanceId(task.getProcessInstanceId());
+                List<HisTasksResponseDTO> collect = getHistoryByInstanceId(hisTasksRequest, task.getBizId()).stream().filter(hisTask -> StringUtils.isNotBlank(hisTask.getTaskId()) && hisTask.getTaskId().equals(task.getTaskId())).collect(Collectors.toList());
+                if (collect.size() > 0) {
+                    Integer batch = collect.get(0).getBatch();
+                    detailsById.setBatch(batch);
+                }
+
+            }
+
             task.setData(detailsById);
         });
         IPage<TodoTaskDTO> todoTaskDTOIPage = new Page<>();