修改防火监督的计划创建错误bug 和检查结果时间格式化的问题

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/WorkFlowBranchEnum.java

@@ -10,11 +10,9 @@ import java.util.Map;
  */
 
 public enum WorkFlowBranchEnum {
-
-    DAILY("日常检查", "company", "daily", "daily"),
-    SPECIAL_C("专项检查", "company", "special", "special"),
-    SPECIAL_E("专项检查", "external", "special-daily", "special"),
-    SUPERVISED_DW("单位级审核", "department", "special-daily", "supervised");
+    DAILY("日常检查", "company-external", "daily", "daily"),
+    SPECIAL("专项检查", "company-external", "special", "special"),
+    SUPERVISED_DW("单位级审核", "department", "special-daily", "supervised");  
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

@@ -63,7 +63,7 @@ public class DangerDto implements Serializable {
     /**
      * 整改期限
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reformLimitDate;
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.excel.DataSources;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper;
 import com.yeejoin.amos.supervision.business.dao.repository.ICheckInputDao;
@@ -40,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
@@ -172,6 +174,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             r.setInputItemName(hiddenDangerDto != null ? hiddenDangerDto.getInputItemName() : "");
             r.setDangerTypeName(hiddenDangerDto != null ? hiddenDangerDto.getDangerTypeName() : "");
             r.setDangerType(hiddenDangerDto != null ? hiddenDangerDto.getDangerType() : "");
+            r.setReformLimitDate(DateUtils.longStr2Date(DateUtils.date2LongStr(r.getReformLimitDate())));
         });
         return dangerDtoIPage;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -292,7 +292,7 @@ public class PlanServiceImpl implements IPlanService {
         List<Map<String, String>> enumList = WorkFlowBranchEnum.getEnumList();
         if (!ObjectUtils.isEmpty(enumList)){
             List<Map<String, String>> list = enumList.stream().filter(map ->
-                    (dangerCheckTypeLevel.equals(map.get("dangerCheckTypeLevel")) && map.get("checkType").contains(checkType)
+                    (dangerCheckTypeLevel.contains(map.get("dangerCheckTypeLevel")) && map.get("checkType").contains(checkType)
             )).collect(Collectors.toList());
 
             if (!ObjectUtils.isEmpty(list)) {