优化作业状态判断及设置逻辑

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<>();