提交代码

ruoyi-admin/src/main/resources/application-dev.yml

@@ -104,11 +104,11 @@ spring:
     # 地址
     host: 127.0.0.1
     # 端口，默认为6379
-    port: 16379
+    port: 6379
     # 数据库索引
     database: 0
     # 密码(如没有密码请注释掉)
-    password: sooka123456
+    #    password: sooka123456
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -68,34 +68,28 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     private ZEngineeringCivilMapper zEngineeringCivilMapper;
 
     @Override
-    public TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery,String nodeType,String createBy,String enginClassification) {
+    public TableDataInfo<Map<String, Object>> getByUserList(String type, String enginName, String enginType, String enginProcedure, String enginStatus, PageQuery pageQuery, String nodeType, String createBy, String enginClassification) {
         Page<T> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         String leftJoin = null;
         String szAndGy = null;
 
-        if ("1".equals(type)){
+        if ("1".equals(type)) {
             leftJoin = "z_engineering_pipe_jacking"; // 顶管
             enginType = "";
-        }
-        else if ("2".equals(type)){
+        } else if ("2".equals(type)) {
             leftJoin = "z_engineering_infrastructure"; // 基建
             enginType = "";
-        }
-        else if ("3".equals(type)){
+        } else if ("3".equals(type)) {
             leftJoin = "z_engineering_dangerous"; // 危险工程
-        }
-        else if ("4".equals(type)){
+        } else if ("4".equals(type)) {
             leftJoin = "z_engineering_industry"; // 市政工程
             enginType = "";
-        }
-        else if ("5".equals(type)){
+        } else if ("5".equals(type)) {
             leftJoin = "z_engineering_gy"; // 工业工程
             szAndGy = "gy";
-        }
-        else if ("6".equals(type)){
+        } else if ("6".equals(type)) {
             leftJoin = "z_engineering_air_wall"; // 带气工程
-        }
-        else if ("7".equals(type)){
+        } else if ("7".equals(type)) {
             leftJoin = "z_touch_operation_engineering"; // 碰口工程
             szAndGy = "pk";
         }
@@ -108,24 +102,24 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         String username = createBy;
         Page<Map<String, Object>> listPage = null;
         if (type.equals("6")) {
-            listPage = baseMapper.getByUserList1(DateList, username, leftJoin, szAndGy, page,enginName,enginType);
+            listPage = baseMapper.getByUserList1(DateList, username, leftJoin, szAndGy, page, enginName, enginType);
         } else {
-            listPage = baseMapper.getByUserList(DateList, username, leftJoin, szAndGy, page,enginName,enginType,enginClassification);
+            listPage = baseMapper.getByUserList(DateList, username, leftJoin, szAndGy, page, enginName, enginType, enginClassification);
         }
 
-        if ("1".equals(type)){ // 顶管
+        if ("1".equals(type)) { // 顶管
             listPage.getRecords().forEach(item -> {
 
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
                 MonthTableNameHandler.setData(date);
 
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
                 List<SysDictData> municipalEngineeringNode = sysDictMap.get("pipe_jack");
                 mapList.forEach(ite -> {
-                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    String str = "2".equals(ite.get("reviewStatus")) ? "未审核" : "1".equals(ite.get("reviewStatus")) ? "通过" : "未通过";
                     // "municipal_engineering_node";
-                    ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                    ite.put("type", municipalEngineeringNode.stream().filter(ie -> ie.getDictValue().equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
                     ite.put("reviewStatus", str);
                 });
                 List<Map<String, String>> finalMapList = mapList;
@@ -134,34 +128,34 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     List<Map<String, String>> type1 = finalMapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
                     if (type1.size() == 0) {
                         HashMap<String, String> objectObjectHashMap = new HashMap<>();
-                        objectObjectHashMap.put("reviewStatus","未审核");
-                        objectObjectHashMap.put("type",dictLabel);
+                        objectObjectHashMap.put("reviewStatus", "未审核");
+                        objectObjectHashMap.put("type", dictLabel);
                         finalMapList.add(objectObjectHashMap);
                     }
                 });
                 mapList = finalMapList;
-                if (!ObjectUtils.isEmpty(enginStatus)){
-                    String s = "2".equals(enginStatus)?"未审核":"1".equals(enginStatus)?"通过":"未通过";
-                    mapList = mapList.stream().filter(obj->obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(enginStatus)) {
+                    String s = "2".equals(enginStatus) ? "未审核" : "1".equals(enginStatus) ? "通过" : "未通过";
+                    mapList = mapList.stream().filter(obj -> obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
                 }
-                if (!ObjectUtils.isEmpty(nodeType)){
-                    mapList = mapList.stream().filter(obj->obj.get("type").equals(nodeType)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(nodeType)) {
+                    mapList = mapList.stream().filter(obj -> obj.get("type").equals(nodeType)).collect(Collectors.toList());
                 }
-                item.put("status",mapList);
+                item.put("status", mapList);
                 MonthTableNameHandler.removeData();
             });
-        }
-        else if ("2".equals(type)){ // 基建
+        } else if ("2".equals(type)) { // 基建
             listPage.getRecords().forEach(item -> {
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                ;
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
                 List<SysDictData> municipalEngineeringNode = sysDictMap.get("engineering_infrastructure");
                 mapList.forEach(ite -> {
-                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    String str = "2".equals(ite.get("reviewStatus")) ? "未审核" : "1".equals(ite.get("reviewStatus")) ? "通过" : "未通过";
                     // "municipal_engineering_node";
-                    ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                    ite.put("type", municipalEngineeringNode.stream().filter(ie -> ie.getDictValue().equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
                     ite.put("reviewStatus", str);
                 });
                 List<Map<String, String>> finalMapList = mapList;
@@ -170,55 +164,55 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     List<Map<String, String>> type1 = finalMapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
                     if (type1.size() == 0) {
                         HashMap<String, String> objectObjectHashMap = new HashMap<>();
-                        objectObjectHashMap.put("reviewStatus","未审核");
-                        objectObjectHashMap.put("type",dictLabel);
+                        objectObjectHashMap.put("reviewStatus", "未审核");
+                        objectObjectHashMap.put("type", dictLabel);
                         finalMapList.add(objectObjectHashMap);
                     }
                 });
                 mapList = finalMapList;
-                if (!ObjectUtils.isEmpty(enginStatus)){
-                    String s = "2".equals(enginStatus)?"未审核":"1".equals(enginStatus)?"通过":"未通过";
-                    mapList = mapList.stream().filter(obj->obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(enginStatus)) {
+                    String s = "2".equals(enginStatus) ? "未审核" : "1".equals(enginStatus) ? "通过" : "未通过";
+                    mapList = mapList.stream().filter(obj -> obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
                 }
-                if (!ObjectUtils.isEmpty(nodeType)){
-                    mapList = mapList.stream().filter(obj->obj.get("type").equals(nodeType)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(nodeType)) {
+                    mapList = mapList.stream().filter(obj -> obj.get("type").equals(nodeType)).collect(Collectors.toList());
                 }
-                item.put("status",mapList);
+                item.put("status", mapList);
                 MonthTableNameHandler.removeData();
             });
-        }
-        else if ("3".equals(type)){ // 危险工程
+        } else if ("3".equals(type)) { // 危险工程
             listPage.getRecords().forEach(item -> {
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
-;
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                ;
+                ;
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 mapList.forEach(ite -> {
-                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    String str = "2".equals(ite.get("reviewStatus")) ? "未审核" : "1".equals(ite.get("reviewStatus")) ? "通过" : "未通过";
                     ite.put("reviewStatus", str);
                 });
-                if (!ObjectUtils.isEmpty(enginStatus)){
-                    String s = "2".equals(enginStatus)?"未审核":"1".equals(enginStatus)?"通过":"未通过";
-                    mapList = mapList.stream().filter(obj->obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(enginStatus)) {
+                    String s = "2".equals(enginStatus) ? "未审核" : "1".equals(enginStatus) ? "通过" : "未通过";
+                    mapList = mapList.stream().filter(obj -> obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
                 }
-                item.put("status",mapList);
+                item.put("status", mapList);
                 MonthTableNameHandler.removeData();
             });
-        }
-        else if ("4".equals(type)){ // 市政工程
+        } else if ("4".equals(type)) { // 市政工程
             listPage.getRecords().forEach(item -> {
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
-;
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                ;
+                ;
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
                 List<SysDictData> municipalEngineeringNode = sysDictMap.get("municipal_node_types");
                 mapList.forEach(ite -> {
-                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    String str = "2".equals(ite.get("reviewStatus")) ? "未审核" : "1".equals(ite.get("reviewStatus")) ? "通过" : "未通过";
                     try {
-                        ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                        ite.put("type", municipalEngineeringNode.stream().filter(ie -> ie.getDictValue().equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
                     } catch (Exception e) {
-                        ite.put("type","");
+                        ite.put("type", "");
                     }
                     ite.put("reviewStatus", str);
                 });
@@ -228,45 +222,44 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     List<Map<String, String>> type1 = finalMapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
                     if (type1.size() == 0) {
                         HashMap<String, String> objectObjectHashMap = new HashMap<>();
-                        objectObjectHashMap.put("reviewStatus","未审核");
-                        objectObjectHashMap.put("type",dictLabel);
+                        objectObjectHashMap.put("reviewStatus", "未审核");
+                        objectObjectHashMap.put("type", dictLabel);
                         finalMapList.add(objectObjectHashMap);
                     }
                 });
                 mapList = finalMapList;
-                if (!ObjectUtils.isEmpty(enginStatus)){
-                    String s = "2".equals(enginStatus)?"未审核":"1".equals(enginStatus)?"通过":"未通过";
-                    mapList = mapList.stream().filter(obj->obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(enginStatus)) {
+                    String s = "2".equals(enginStatus) ? "未审核" : "1".equals(enginStatus) ? "通过" : "未通过";
+                    mapList = mapList.stream().filter(obj -> obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
                 }
-                if (!ObjectUtils.isEmpty(nodeType)){
-                    mapList = mapList.stream().filter(obj->obj.get("type").equals(nodeType)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(nodeType)) {
+                    mapList = mapList.stream().filter(obj -> obj.get("type").equals(nodeType)).collect(Collectors.toList());
                 }
-                item.put("status",mapList);
+                item.put("status", mapList);
                 MonthTableNameHandler.removeData();
             });
-        }
-        else if ("5".equals(type)){ // 工业工程
+        } else if ("5".equals(type)) { // 工业工程
             listPage.getRecords().forEach(item -> {
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
                 List<SysDictData> municipalEngineeringNode = new ArrayList<>();
-                if (item.get("enginClassification").equals("室内管线")){
+                if (item.get("enginClassification").equals("室内管线")) {
                     municipalEngineeringNode.addAll(sysDictMap.get("gy_inner"));
                 }
-                if (item.get("enginClassification").equals("室外管线")){
+                if (item.get("enginClassification").equals("室外管线")) {
                     municipalEngineeringNode.addAll(sysDictMap.get("gy_out"));
                 }
-                if (item.get("enginClassification").equals("调压柜")){
+                if (item.get("enginClassification").equals("调压柜")) {
                     municipalEngineeringNode.addAll(sysDictMap.get("gy_tyg"));
                 }
                 mapList.forEach(ite -> {
-                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    String str = "2".equals(ite.get("reviewStatus")) ? "未审核" : "1".equals(ite.get("reviewStatus")) ? "通过" : "未通过";
                     try {
-                        ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                        ite.put("type", municipalEngineeringNode.stream().filter(ie -> ie.getDictValue().equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
                     } catch (Exception e) {
-                        ite.put("type","");
+                        ite.put("type", "");
                     }
                     ite.put("reviewStatus", str);
                 });
@@ -276,72 +269,71 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     List<Map<String, String>> type1 = finalMapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
                     if (type1.size() == 0) {
                         HashMap<String, String> objectObjectHashMap = new HashMap<>();
-                        objectObjectHashMap.put("reviewStatus","未审核");
-                        objectObjectHashMap.put("type",dictLabel);
+                        objectObjectHashMap.put("reviewStatus", "未审核");
+                        objectObjectHashMap.put("type", dictLabel);
                         finalMapList.add(objectObjectHashMap);
                     }
                 });
                 mapList = finalMapList;
-                if (!ObjectUtils.isEmpty(enginStatus)){
-                    String s = "2".equals(enginStatus)?"未审核":"1".equals(enginStatus)?"通过":"未通过";
-                    mapList = mapList.stream().filter(obj->obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(enginStatus)) {
+                    String s = "2".equals(enginStatus) ? "未审核" : "1".equals(enginStatus) ? "通过" : "未通过";
+                    mapList = mapList.stream().filter(obj -> obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
                 }
-                if (!ObjectUtils.isEmpty(nodeType)){
-                    mapList = mapList.stream().filter(obj->obj.get("type").equals(nodeType)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(nodeType)) {
+                    mapList = mapList.stream().filter(obj -> obj.get("type").equals(nodeType)).collect(Collectors.toList());
                 }
-                item.put("status",mapList);
+                item.put("status", mapList);
                 MonthTableNameHandler.removeData();
             });
             MonthTableNameHandler.removeData();
-        }
-        else if ("6".equals(type)){ // 带气封堵
+        } else if ("6".equals(type)) { // 带气封堵
             listPage.getRecords().forEach(item -> {
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
                 List<SysDictData> municipalEngineeringNode = sysDictMap.get("air_wall_node");
 
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 mapList.forEach(ite -> {
-                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    String str = "2".equals(ite.get("reviewStatus")) ? "未审核" : "1".equals(ite.get("reviewStatus")) ? "通过" : "未通过";
                     ite.put("reviewStatus", str);
                 });
-                if (!ObjectUtils.isEmpty(enginStatus)){
-                    String s = "2".equals(enginStatus)?"未审核":"1".equals(enginStatus)?"通过":"未通过";
-                    mapList = mapList.stream().filter(obj->obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(enginStatus)) {
+                    String s = "2".equals(enginStatus) ? "未审核" : "1".equals(enginStatus) ? "通过" : "未通过";
+                    mapList = mapList.stream().filter(obj -> obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
                 }
-                item.put("status",mapList);
+                item.put("status", mapList);
             });
             MonthTableNameHandler.removeData();
-        }
-        else if ("7".equals(type)){ // 带气封堵
+        } else if ("7".equals(type)) { // 带气封堵
 
             listPage.getRecords().forEach(item -> {
                 String modeOperation = item.get("modeOperation").toString();
                 String dists = "";
-                if ("地埋扳孔".equals(modeOperation)){
-                    dists="bury_the_wrench_hole";
-                }else if ("架空扳孔".equals(modeOperation)){
-                    dists="aerial_wrench_hole";
-                }else if ("停气作业".equals(modeOperation)){
-                    dists="shutdown_operation";
-                }else if ("PE 封堵".equals(modeOperation)){
-                    dists="pe_plugging";
-                }else if ("钢管带气封堵".equals(modeOperation)){
-                    dists="the_steel_pipe_sealed_with_gas";
+                if ("地埋扳孔".equals(modeOperation)) {
+                    dists = "bury_the_wrench_hole";
+                } else if ("架空扳孔".equals(modeOperation)) {
+                    dists = "aerial_wrench_hole";
+                } else if ("停气作业".equals(modeOperation)) {
+                    dists = "shutdown_operation";
+                } else if ("PE 封堵".equals(modeOperation)) {
+                    dists = "pe_plugging";
+                } else if ("钢管带气封堵".equals(modeOperation)) {
+                    dists = "the_steel_pipe_sealed_with_gas";
                 }
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime) item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
+                ;
                 ;
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
                 List<SysDictData> municipalEngineeringNode = sysDictMap.get(dists);
                 mapList.forEach(ite -> {
-                    String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
+                    String str = "2".equals(ite.get("reviewStatus")) ? "未审核" : "1".equals(ite.get("reviewStatus")) ? "通过" : "未通过";
                     try {
-                        ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
+                        ite.put("type", municipalEngineeringNode.stream().filter(ie -> ie.getDictValue().equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
                     } catch (Exception e) {
-                        ite.put("type","");
+                        ite.put("type", "");
                     }
                     ite.put("reviewStatus", str);
                 });
@@ -351,20 +343,20 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     List<Map<String, String>> type1 = finalMapList.stream().filter(it -> it.get("type").equals(dictLabel)).collect(Collectors.toList());
                     if (type1.size() == 0) {
                         HashMap<String, String> objectObjectHashMap = new HashMap<>();
-                        objectObjectHashMap.put("reviewStatus","未审核");
-                        objectObjectHashMap.put("type",dictLabel);
+                        objectObjectHashMap.put("reviewStatus", "未审核");
+                        objectObjectHashMap.put("type", dictLabel);
                         finalMapList.add(objectObjectHashMap);
                     }
                 });
                 mapList = finalMapList;
-                if (!ObjectUtils.isEmpty(enginStatus)){
-                    String s = "2".equals(enginStatus)?"未审核":"1".equals(enginStatus)?"通过":"未通过";
-                    mapList = mapList.stream().filter(obj->obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(enginStatus)) {
+                    String s = "2".equals(enginStatus) ? "未审核" : "1".equals(enginStatus) ? "通过" : "未通过";
+                    mapList = mapList.stream().filter(obj -> obj.get("reviewStatus").equals(s)).collect(Collectors.toList());
                 }
-                if (!ObjectUtils.isEmpty(nodeType)){
-                    mapList = mapList.stream().filter(obj->obj.get("type").equals(nodeType)).collect(Collectors.toList());
+                if (!ObjectUtils.isEmpty(nodeType)) {
+                    mapList = mapList.stream().filter(obj -> obj.get("type").equals(nodeType)).collect(Collectors.toList());
                 }
-                item.put("status",mapList);
+                item.put("status", mapList);
                 MonthTableNameHandler.removeData();
             });
         }
@@ -389,7 +381,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
         ArrayList<ZEngineeringIndustryVo> list = new ArrayList<>();
         list.add(zEngineeringIndustryVo);
-        zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewSZList(list)!=null?nodeService.ReViewSZList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
+        zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewSZList(list) != null ? nodeService.ReViewSZList(list).get(zEngineeringIndustryVo.getId()) : Collections.EMPTY_LIST);
         return zEngineeringIndustryVo;
     }
 
@@ -443,7 +435,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     public Boolean insertByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry add = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(add);
-        if (StringUtils.isEmpty(bo.getId())){
+        if (StringUtils.isEmpty(bo.getId())) {
             boolean flag = baseMapper.insert(add) > 0;
             if (flag) {
                 bo.setId(add.getId());
@@ -467,8 +459,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
             }
             return flag;
-        }
-        else if (StringUtils.isNotBlank(bo.getId())){
+        } else if (StringUtils.isNotBlank(bo.getId())) {
             ZEngineeringIndustryVo voById = baseMapper.selectVoById(bo.getId());
             List<ZEngineeringNodeBo> zEngineeringNodeBoList = bo.getzEngineeringNodeBoList();
             ZEngineeringNodeBo entity = bo.getzEngineeringNodeBo();
@@ -647,7 +638,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     @Override
-    public List<Map<String,String>> getByUserListAndDicts(String dictType) {
+    public List<Map<String, String>> getByUserListAndDicts(String dictType) {
         return baseMapper.getDicts(dictType);
     }