Merge branch 'dev_2.6.0' of http://120.46.174.3:8099/zlmy/zlmy-cloud into dev_2.6.0

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/enums/WorkTypeEnum.java

@@ -30,37 +30,37 @@ public enum WorkTypeEnum {
     /**
      * 临时用电作业
      */
-    TEMPORARY_ELECTRICITY_WORK("5", "临时用电作业"),
+    TEMPORARY_ELECTRICITY_WORK("16", "临时用电作业"),
 
     /**
      * 吊装作业
      */
-    LIFTING_WORK("6", "吊装作业"),
+    LIFTING_WORK("9", "吊装作业"),
 
     /**
      * 动土作业
      */
-    EARTHWORK("7", "动土作业"),
+    EARTHWORK("10", "动土作业"),
 
     /**
      * 断路作业
      */
-    DISCONNECTION_WORK("8", "断路作业"),
+    DISCONNECTION_WORK("11", "断路作业"),
 
     /**
      * 液氨接卸作业
      */
-    AMMONIA_UNLOADING("9", "液氨接卸作业"),
+    AMMONIA_UNLOADING("19", "液氨接卸作业"),
 
     /**
      * 熏蒸作业
      */
-    FUMIGATION_WORK("10", "熏蒸作业"),
+    FUMIGATION_WORK("17", "熏蒸作业"),
 
     /**
      * 环流熏蒸作业
      */
-    CIRCULATING_FUMIGATION("11", "环流熏蒸作业"),
+    CIRCULATING_FUMIGATION("18", "环流熏蒸作业"),
 
     /**
      * 进仓

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

@@ -254,7 +254,11 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
             if (sysOrgVo != null) {
                 tHazardWorkPlanDTO.setOrgName(sysOrgVo.getSubSectorPath());
             }
-            tHazardWorkPlanDTO.setBuildWorkStatus(buildWorkStatus(tHazardWorkPlanDTO));
+            String buildWorkStatus = buildWorkStatus(tHazardWorkPlanDTO);
+            tHazardWorkPlanDTO.setBuildWorkStatus(buildWorkStatus);
+            if (buildWorkStatus.equals(WorkPlanStatusEnum.TO_BE_CLOSED.getValue())){
+                tHazardWorkPlanDTO.setWorkStatus(WorkPlanStatusEnum.TO_BE_CLOSED.getDescription());
+            }
             tHazardWorkPlanDTO.setCheckCount(tHazardWorkPlanCheckDao.countByPlanId(tHazardWorkPlanDTO.getId()));
         }
         Page<THazardWorkPlanDTO> planPage = new Page<>();