危险作业条件确认 bug修改

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

@@ -98,6 +98,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -1226,7 +1227,35 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
 
             }*/
 
+            /*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);
+                }
+            }*/
+
             if (processDefinitionId.contains("hazardousWorkDailyCheck")){
+                String todayStr = LocalDate.now().format(DateTimeFormatter.ISO_DATE);
+
+                // 先查今天是否已有记录
+                THazardConditionConfirmation todayConfirmation = tHazardConditionConfirmationService.lambdaQuery()
+                        .eq(THazardConditionConfirmation::getPlanId, task.getBizId())
+                        .likeRight(THazardConditionConfirmation::getCreateDate, todayStr)
+                        .orderByDesc(THazardConditionConfirmation::getBatch)
+                        .last("LIMIT 1")
+                        .one();
+
+                if (todayConfirmation != null) {
+                    // 今天已有记录，直接用今天的 batch
+                    detailsById.setBatch(todayConfirmation.getBatch());
+                } else {
+                    // 今天没有记录，查最大批次 +1，指向即将创建的新批次
                     THazardConditionConfirmation latestConfirmation = tHazardConditionConfirmationService.lambdaQuery()
                             .eq(THazardConditionConfirmation::getPlanId, task.getBizId())
                             .orderByDesc(THazardConditionConfirmation::getBatch)
@@ -1238,6 +1267,7 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
                         detailsById.setBatch(1);
                     }
                 }
+            }
 
             task.setData(detailsById);
         });