修改

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

@@ -53,9 +53,12 @@ spring:
 #          url: jdbc:mysql://192.168.10.15:63306/zdsz_xstb?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
 #          username: root
 #          password: sooka1a2b3c4d%...
-          url: jdbc:mysql://123.249.95.134:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://120.53.226.242:3306/zhenda?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: ZDSZ1a2b3c4d%...
+          password: Lanyuxinxi@88.com
+#          url: jdbc:mysql://123.249.95.134:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+#          username: root
+#          password: ZDSZ1a2b3c4d%...
         # 从库数据源
 #        slave:
 #          lazy: true

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

@@ -1210,13 +1210,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                             nodeTypeList.add(ifhave);
                         }
                     }
-                }else{
+                }
+                else{
                     if(!ObjectUtils.isEmpty(infoList) && "99".equals(infoList.get(0).getState())){
                         ZEngineeringReview ifhave = new ZEngineeringReview();
                         ifhave.setEngInfoId(item2.getId());
                         ifhave.setReviewStatus("99");
                         ifhave.setReviewContent("有暂存");
                         nodeTypeList.add(ifhave);
+                    }else if (infoList.isEmpty()){
+                        ZEngineeringReview ifhave = new ZEngineeringReview();
+                        ifhave.setEngInfoId(item2.getId());
+                        ifhave.setReviewStatus("-1");
+                        ifhave.setReviewContent("无数据");
+                        nodeTypeList.add(ifhave);
                     }else{
                         if (ReviewList.size() > 0) {
                             String content = "";
@@ -1255,8 +1262,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
 //                    }
                     if (nodeList.size()>0&&nodeList.stream().anyMatch(x->x.getType().equals(item3.getDictValue()))){
                         map.put("Type",item3.getDictValue());
-                        map.put("state",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewStatus():"0");
-                        map.put("content",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent():"暂未审核");
+                        map.put("state",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?
+                                nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewStatus() : "0");
+                        map.put("content",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent(): "暂未审核");
                         String enginfoid = nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getEngInfoId():null;
                         if(StringUtils.isNotBlank(enginfoid)&&!"2".equals(map.get("state").toString())){
                             LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();