优化危险作业暂存逻辑

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

@@ -616,8 +616,8 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
             List<THazardAssessment> tHazardAssessments = tHazardAssessmentService.list(new QueryWrapper<THazardAssessment>().eq(THazardAssessment.PLAN_ID, tHazardWorkPlan.getId())
                     .isNotNull(THazardAssessment.PARTICIPANT_SIGNATURE)
                     .isNotNull(THazardAssessment.WORK_SITE_RESPONSIBLE_SIGNATURE)
-                    .ne(THazardAssessment.PARTICIPANT_SIGNATURE, " ")
-                    .ne(THazardAssessment.WORK_SITE_RESPONSIBLE_SIGNATURE, " ")
+                    .ne(THazardAssessment.PARTICIPANT_SIGNATURE, "")
+                    .ne(THazardAssessment.WORK_SITE_RESPONSIBLE_SIGNATURE, "")
             );
 
             log.info("危险作业流程--workProcessValidation---tHazardAssessments:{}", JSON.toJSONString(tHazardAssessments));
@@ -629,7 +629,11 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         //如果为条件确认
         else if (workStatus.equals(WorkPlanStatusEnum.CONDITION_CONFIRMATION.getValue())) {
             List<String> dangeWorkType = sysDictDataService.getDictIdsByParentKeyAndType(WorkTypeEnum.ENTRY_EXIT_WAREHOUSE.getValue(), "dange_work_type");
-
+            //添加熏蒸作业
+            SysDictData sysDictData = sysDictDataService.getDictByTypeAndValue("dange_work_type", WorkTypeEnum.FUMIGATION_WORK.getValue());
+            if (sysDictData != null) {
+                dangeWorkType.add(sysDictData.getDictDataId());
+            }
             //判断当前是否为 较大和高风险
             boolean isHighRisk = WorkLevelEnum.MEDIUM_RISK.getValue().equals(escalatedLevelValue) || WorkLevelEnum.HIGH_RISK.getValue().equals(escalatedLevelValue);
 
@@ -638,13 +642,13 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
                     .and(wrapper -> {
                         wrapper.in(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkType) //如果是进出仓
                                 .isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE) //作业现场负责人不能为空
-                                .ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, " ")
+                                .ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "")
                                 .or()
                                 .notIn(THazardConditionConfirmation.WORK_TYPE_ID, dangeWorkType) //如果不为进出仓
                                 .isNotNull(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE) //安全管理部门不能为空
-                                .ne(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE, " ")
+                                .ne(isHighRisk, THazardConditionConfirmation.DEPARTMENT_SIGNATURE, "")
                                 .isNotNull(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE) //作业现场负责人不能为空
-                                .ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, " ");
+                                .ne(THazardConditionConfirmation.WORK_SITE_RESPONSIBLE_SIGNATURE, "");
                     })
             );
             if (tHazardConditionConfirmations.size() < workTypesArrayLength) {
@@ -658,8 +662,8 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
                     .eq(THazardDisclosure.BATH, tHazardWorkPlan.getBatch())
                     .isNotNull(THazardDisclosure.DISCLOSURE_PERSON_SIGN)
                     .isNotNull(THazardDisclosure.RECIPIENT_SIGNATURE)
-                    .ne(THazardDisclosure.DISCLOSURE_PERSON_SIGN, " ")
-                    .ne(THazardDisclosure.RECIPIENT_SIGNATURE, " ")
+                    .ne(THazardDisclosure.DISCLOSURE_PERSON_SIGN, "")
+                    .ne(THazardDisclosure.RECIPIENT_SIGNATURE, "")
             );
             if (tHazardTechnicalDisclosures.size() < workTypesArrayLength) {
                 throw new ServiceException(new ResponseInfo(200, "涉及其他类型的技术交底未签字[serviceError]"));