四大审核

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

@@ -231,9 +231,16 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             if(flag){
                 for (ZEngineeringNodeBo nodeBo : zEngineeringNodeBos) {
                     if(nodeBo.getType().equals(dictData.getDictValue())){
-                        String status = nodeBo.getReviewStatus();
-                        String value = "2".equals(status)?"未审核":"1".equals(status)?"通过":"未通过";
-                        map.put("value", value);
+                        if(nodeBo.getzEngineeringInfoBoList().size() == 0){
+                            map.put("value", "未上传"); // 上传过 创建过节点 后来删了工程信息 但是节点数据依然在
+                        }else if (nodeBo.getzEngineeringInfoBoList().stream().anyMatch(ele -> "0".equals(ele.getState()))) {
+                            map.put("value", "未通过");
+                        } else if (nodeBo.getzEngineeringInfoBoList().stream().allMatch(ele -> "1".equals(ele.getState()))) {
+                            map.put("value", "通过");
+                        } else {
+                            map.put("value", "未审核");
+                        }
+                        break;
                     }
                 }
             }else {
@@ -279,9 +286,16 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             if(flag){
                 for (ZEngineeringNodeBo nodeBo : zEngineeringNodeBos) {
                     if(nodeBo.getType().equals(dictData.getDictValue())){
-                        String status = nodeBo.getReviewStatus();
-                        String value = "2".equals(status)?"未审核":"1".equals(status)?"通过":"未通过";
-                        map.put("value", value);
+                        if(nodeBo.getzEngineeringInfoBoList().size() == 0){
+                            map.put("value", "未上传"); // 上传过 创建过节点 后来删了工程信息 但是节点数据依然在
+                        }else if (nodeBo.getzEngineeringInfoBoList().stream().anyMatch(ele -> "0".equals(ele.getState()))) {
+                            map.put("value", "未通过");
+                        } else if (nodeBo.getzEngineeringInfoBoList().stream().allMatch(ele -> "1".equals(ele.getState()))) {
+                            map.put("value", "通过");
+                        } else {
+                            map.put("value", "未审核");
+                        }
+                        break;
                     }
                 }
             }else {
@@ -354,9 +368,16 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             if(flag){
                 for (ZEngineeringNodeBo nodeBo : zEngineeringNodeBos) {
                     if(nodeBo.getType().equals(dictData.getDictValue())){
-                        String status = nodeBo.getReviewStatus();
-                        String value = "2".equals(status)?"未审核":"1".equals(status)?"通过":"未通过";
-                        map.put("value", value);
+                        if(nodeBo.getzEngineeringInfoBoList().size() == 0){
+                            map.put("value", "未上传"); // 上传过 创建过节点 后来删了工程信息 但是节点数据依然在
+                        }else if (nodeBo.getzEngineeringInfoBoList().stream().anyMatch(ele -> "0".equals(ele.getState()))) {
+                            map.put("value", "未通过");
+                        } else if (nodeBo.getzEngineeringInfoBoList().stream().allMatch(ele -> "1".equals(ele.getState()))) {
+                            map.put("value", "通过");
+                        } else {
+                            map.put("value", "未审核");
+                        }
+                        break;
                     }
                 }
             }else {