危险作业条件确认 bug修改

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

@@ -1215,7 +1215,7 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
 
             String processDefinitionId = task.getProcessDefinitionId();
             //如果是跨天待办
-            if (processDefinitionId.contains("hazardousWorkDailyCheck")){
+            /*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());
@@ -1224,6 +1224,19 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
                     detailsById.setBatch(batch);
                 }
 
+            }*/
+
+            if (processDefinitionId.contains("hazardousWorkDailyCheck")){
+                THazardConditionConfirmation latestConfirmation = tHazardConditionConfirmationService.lambdaQuery()
+                        .eq(THazardConditionConfirmation::getPlanId, task.getBizId())
+                        .orderByDesc(THazardConditionConfirmation::getBatch)
+                        .last("LIMIT 1")
+                        .one();
+                if (latestConfirmation != null && latestConfirmation.getBatch() != null) {
+                    detailsById.setBatch(latestConfirmation.getBatch() + 1);
+                } else {
+                    detailsById.setBatch(1);
+                }
             }
 
             task.setData(detailsById);