修改

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringNodeBo.java

@@ -53,6 +53,7 @@ public class ZEngineeringNodeBo extends BaseEntity {
      * 审核内容
      */
     private String reviewContent;
+    private Boolean temporaryOrNot;
 
     /**
      * 备注

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

@@ -948,7 +948,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
 
             }
             return flag;
-        } else {
+        }
+        else {
             if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList())) {
                 for (ZEngineeringNodeBo zEngineeringNodeBo : bo.getzEngineeringNodeBoList()) {
                     zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());

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

@@ -78,7 +78,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     @Autowired
     private ZEngineeringMaterialMapper zEngineeringMaterialMapper;
     @Autowired
-    private  ZEnginMaterialQualityMapper zEnginMaterialQualityMapper;
+    private ZEnginMaterialQualityMapper zEnginMaterialQualityMapper;
 
 
     /**
@@ -88,6 +88,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     public ZEngineeringNodeVo queryById(String id) {
         return baseMapper.selectVoById(id);
     }
+
     @Override
     @DynamicName(spel = "#bo.createTime")
     public List<String> queryPhotoList(ZEngineeringNodeBo bo) {
@@ -118,11 +119,11 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         List<ZEngineeringInfoBo> zEngineeringInfoBo = izEngineeringInfoService.query(zEngineeringNodeBo);
         ZEngineeringReviewBo zEngineeringReview = izEngineeringReviewService.query(zEngineeringNodeBo);
         String reviewStatus = "";
-        if(!ObjectUtils.isEmpty(zEngineeringInfoBo)){
+        if (!ObjectUtils.isEmpty(zEngineeringInfoBo)) {
             reviewStatus = zEngineeringInfoBo.get(0).getState();
         }
         zEngineeringNodeBo.setReviewStatus(reviewStatus);
-//        zEngineeringNodeBo.setReviewStatus(ObjectUtils.isEmpty(zEngineeringReview) ? "0" : zEngineeringReview.getReviewStatus());
+        //        zEngineeringNodeBo.setReviewStatus(ObjectUtils.isEmpty(zEngineeringReview) ? "0" : zEngineeringReview.getReviewStatus());
         zEngineeringNodeBo.setReviewContent(ObjectUtils.isEmpty(zEngineeringReview) ? "0" : zEngineeringReview.getReviewContent());
         zEngineeringNodeBo.setId(zEngineeringNode.getId());
         zEngineeringNodeBo.setzEngineeringInfoBoList(zEngineeringInfoBo);
@@ -539,20 +540,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     map.put("Type", item3);
                     map.put("state", nodeTypeList.stream().anyMatch(y -> y.getEngInfoId().equals(nodeList.stream().filter(x -> x.getType().equals(item3)).collect(Collectors.toList()).get(0).getId())) ? nodeTypeList.stream().filter(y -> y.getEngInfoId().equals(nodeList.stream().filter(x -> x.getType().equals(item3)).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)).collect(Collectors.toList()).get(0).getId())) ? nodeTypeList.stream().filter(y -> y.getEngInfoId().equals(nodeList.stream().filter(x -> x.getType().equals(item3)).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent() : "暂未审核");
-                    if(!ObjectUtils.isEmpty(nodeTypeList)){
+                    if (!ObjectUtils.isEmpty(nodeTypeList)) {
                         LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                         lqw3.eq(StringUtils.isNotBlank(nodeTypeList.get(0).getId()), ZEngineeringInfo::getEngInfoId, nodeTypeList.get(0).getId());
-                        List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                        if(!ObjectUtils.isEmpty(info)){
-                            map.put("Type",item3);
-                            map.put("state","0");
-                            map.put("content","暂未审核");
+                        List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                        if (!ObjectUtils.isEmpty(info)) {
+                            map.put("Type", item3);
+                            map.put("state", "0");
+                            map.put("content", "暂未审核");
                         }
                     }
-                }else {
-                    map.put("Type",item3);
-                    map.put("state","-1");
-                    map.put("content","无数据");
+                } else {
+                    map.put("Type", item3);
+                    map.put("state", "-1");
+                    map.put("content", "无数据");
                 }
                 stateList.add(map);
                 ReViewStateMap.set(stateList);
@@ -641,11 +642,15 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
         bo.getzEngineeringInfoBo().setUpdateTime(new Date());
         izEngineeringReviewService.deleteByInfoId(bo);
-        List<ZEngineeringInfoVo> zEngineeringInfoVoList = izEngineeringInfoService.queryList(bo.getzEngineeringInfoBo());
-        if(!ObjectUtils.isEmpty(zEngineeringInfoVoList)){
-            bo.getzEngineeringInfoBo().setId(zEngineeringInfoVoList.get(0).getId());
-            izEngineeringInfoService.update(bo.getzEngineeringInfoBo());
-        }else{
+        if (bo.getTemporaryOrNot()) {
+            List<ZEngineeringInfoVo> zEngineeringInfoVoList = izEngineeringInfoService.queryList(bo.getzEngineeringInfoBo());
+            if (!ObjectUtils.isEmpty(zEngineeringInfoVoList)) {
+                bo.getzEngineeringInfoBo().setId(zEngineeringInfoVoList.get(0).getId());
+                izEngineeringInfoService.update(bo.getzEngineeringInfoBo());
+            } else {
+                izEngineeringInfoService.insert(bo.getzEngineeringInfoBo());
+            }
+        } else {
             izEngineeringInfoService.insert(bo.getzEngineeringInfoBo());
         }
         izEngineeringReviewService.deleteByNodeBoId(bo);
@@ -686,13 +691,13 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateMuch(ZEngineeringNodeBo bo) {
         ZEngineeringNode update = BeanUtil.toBean(bo, ZEngineeringNode.class);
-        if (!ObjectUtils.isEmpty(bo.getzEngineeringInfoBoList())){
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringInfoBoList())) {
             bo.getzEngineeringInfoBoList().stream().forEach(item -> {
                 item.setCreateTime(bo.getCreateTime());
                 item.setState("");
                 izEngineeringInfoService.update(item);
             });
-        }else if(!ObjectUtils.isEmpty(bo.getzEngineeringInfoBo())){
+        } else if (!ObjectUtils.isEmpty(bo.getzEngineeringInfoBo())) {
             ZEngineeringInfoBo item = bo.getzEngineeringInfoBo();
             item.setCreateTime(bo.getCreateTime());
             item.setState("");
@@ -723,16 +728,16 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             LocalDate startDate = LocalDate.of(2024, 3, 1); // 指定开始日期
             LocalDate endDate = LocalDate.now(); // 当前日期
             List<String> monthsBetween = getMonthsBetween(startDate, endDate);
-            if(!ObjectUtils.isEmpty(civilIds)){
+            if (!ObjectUtils.isEmpty(civilIds)) {
                 if (StringUtils.isNotBlank(state)) {
-                    if("99".equals(state)){
-                        List<String> nodeList = baseMapper.selectNodeListByMonth(monthsBetween,type,state,civilIds,bo).stream().map(ZEngineeringNode::getCivliId).collect(Collectors.toList());
-                        return minus(civilIds,nodeList);
-                    }else{
-                        nodeTypeList.addAll(baseMapper.selectNodeListByMonth(monthsBetween,type,state,civilIds,bo));
+                    if ("99".equals(state)) {
+                        List<String> nodeList = baseMapper.selectNodeListByMonth(monthsBetween, type, state, civilIds, bo).stream().map(ZEngineeringNode::getCivliId).collect(Collectors.toList());
+                        return minus(civilIds, nodeList);
+                    } else {
+                        nodeTypeList.addAll(baseMapper.selectNodeListByMonth(monthsBetween, type, state, civilIds, bo));
                     }
-                }else{
-                    nodeTypeList.addAll(baseMapper.selectNodeListByMonth(monthsBetween,type,state,civilIds,bo));
+                } else {
+                    nodeTypeList.addAll(baseMapper.selectNodeListByMonth(monthsBetween, type, state, civilIds, bo));
                 }
             }
             if ((!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) || (!"".equals(bo.getCreateBy()) && !ObjectUtils.isEmpty(bo.getCreateBy()))) {
@@ -743,10 +748,10 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     MonthTableNameHandler.setData(date);
                     LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
                     lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringInfo::getId, item.getId());
-                    lqw.like(StringUtils.isNotEmpty(bo.getCreateBy()),ZEngineeringInfo::getCreateBy, bo.getCreateBy());
+                    lqw.like(StringUtils.isNotEmpty(bo.getCreateBy()), ZEngineeringInfo::getCreateBy, bo.getCreateBy());
                     if (!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) {
-                        String startTime = bo.getBeginTime().get(0).toString()+" 00:00:00";
-                        String endTime = bo.getBeginTime().get(1).toString()+" 23:59:59";
+                        String startTime = bo.getBeginTime().get(0).toString() + " 00:00:00";
+                        String endTime = bo.getBeginTime().get(1).toString() + " 23:59:59";
                         lqw.between(ZEngineeringInfo::getUpdateInfoTime, startTime, endTime);
                     }
                     if (zEngineeringInfoMapper.selectCount(lqw) == 0) {
@@ -768,6 +773,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         List<String> minus = list1.stream().filter(item -> !list2.contains(item)).collect(Collectors.toList());
         return minus;
     }
+
     @Override
     public Map<String, Object> ReViewInfrastructureList(List<ZEngineeringInfrastructureVo> list) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
@@ -799,20 +805,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     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() : "暂未审核");
-                    if(!ObjectUtils.isEmpty(nodeTypeList)){
+                    if (!ObjectUtils.isEmpty(nodeTypeList)) {
                         LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                         lqw3.eq(StringUtils.isNotBlank(nodeTypeList.get(0).getId()), ZEngineeringInfo::getEngInfoId, nodeTypeList.get(0).getId());
-                        List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                        if(!ObjectUtils.isEmpty(info)){
-                            map.put("Type",item3.getDictValue());
-                            map.put("state","0");
-                            map.put("content","暂未审核");
+                        List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                        if (!ObjectUtils.isEmpty(info)) {
+                            map.put("Type", item3.getDictValue());
+                            map.put("state", "0");
+                            map.put("content", "暂未审核");
                         }
                     }
-                }else {
-                    map.put("Type",item3.getDictValue());
-                    map.put("state","-1");
-                    map.put("content","无数据");
+                } else {
+                    map.put("Type", item3.getDictValue());
+                    map.put("state", "-1");
+                    map.put("content", "无数据");
                 }
                 stateList.add(map);
                 ReViewStateMap.set(stateList);
@@ -845,23 +851,23 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 if (ReviewList.size() > 0) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-                if("回拖".equals(item2.getType())){
+                if ("回拖".equals(item2.getType())) {
                     LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                     lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
-                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                    info.stream().forEach(item3->{
+                    List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3 -> {
                         LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
-                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
-                        material.stream().forEach(item4->{
+                        List<ZEngineeringMaterial> material = zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4 -> {
                             String materialQualityId = item4.getMaterialQuality();
-                            if(materialQualityId != null){
+                            if (materialQualityId != null) {
                                 ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
-                                if(zEnginMaterialQualityVo != null){
+                                if (zEnginMaterialQualityVo != null) {
                                     String type = zEnginMaterialQualityVo.getMaterialType();
-                                    if("0".equals(type)){
+                                    if ("0".equals(type)) {
                                         item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                                    }else if("1".equals(type)){
+                                    } else if ("1".equals(type)) {
                                         item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
                                     }
                                 }
@@ -879,20 +885,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     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() : "暂未审核");
-                    if(!ObjectUtils.isEmpty(nodeTypeList)){
+                    if (!ObjectUtils.isEmpty(nodeTypeList)) {
                         LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                         lqw3.eq(StringUtils.isNotBlank(nodeTypeList.get(0).getId()), ZEngineeringInfo::getEngInfoId, nodeTypeList.get(0).getId());
-                        List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                        if(!ObjectUtils.isEmpty(info)){
-                            map.put("Type",item3.getDictValue());
-                            map.put("state","0");
-                            map.put("content","暂未审核");
+                        List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                        if (!ObjectUtils.isEmpty(info)) {
+                            map.put("Type", item3.getDictValue());
+                            map.put("state", "0");
+                            map.put("content", "暂未审核");
                         }
                     }
-                }else {
-                    map.put("Type",item3.getDictValue());
-                    map.put("state","-1");
-                    map.put("content","无数据");
+                } else {
+                    map.put("Type", item3.getDictValue());
+                    map.put("state", "-1");
+                    map.put("content", "无数据");
                 }
                 stateList.add(map);
                 ReViewStateMap.set(stateList);
@@ -924,23 +930,23 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 if (!ReviewList.isEmpty()) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-                if("下管".equals(item2.getType())){
+                if ("下管".equals(item2.getType())) {
                     LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                     lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
-                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                    info.stream().forEach(item3->{
+                    List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3 -> {
                         LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
-                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
-                        material.stream().forEach(item4->{
+                        List<ZEngineeringMaterial> material = zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4 -> {
                             String materialQualityId = item4.getMaterialQuality();
-                            if(materialQualityId != null){
+                            if (materialQualityId != null) {
                                 ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
-                                if(zEnginMaterialQualityVo != null){
+                                if (zEnginMaterialQualityVo != null) {
                                     String type = zEnginMaterialQualityVo.getMaterialType();
-                                    if("0".equals(type)){
+                                    if ("0".equals(type)) {
                                         item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                                    }else if("1".equals(type)){
+                                    } else if ("1".equals(type)) {
                                         item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
                                     }
                                 }
@@ -956,90 +962,90 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     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() : "暂未审核");
-                    if(!ObjectUtils.isEmpty(nodeTypeList)){
+                    if (!ObjectUtils.isEmpty(nodeTypeList)) {
                         LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                         lqw3.eq(StringUtils.isNotBlank(nodeTypeList.get(0).getId()), ZEngineeringInfo::getEngInfoId, nodeTypeList.get(0).getId());
-                        List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                        if(!ObjectUtils.isEmpty(info)){
-                            map.put("Type",item3.getDictValue());
-                            map.put("state","0");
-                            map.put("content","暂未审核");
+                        List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                        if (!ObjectUtils.isEmpty(info)) {
+                            map.put("Type", item3.getDictValue());
+                            map.put("state", "0");
+                            map.put("content", "暂未审核");
                         }
                     }
-                }else {
-                    map.put("Type",item3.getDictValue());
-                    map.put("state","-1");
-                    map.put("content","无数据");
+                } else {
+                    map.put("Type", item3.getDictValue());
+                    map.put("state", "-1");
+                    map.put("content", "无数据");
                 }
                 stateList.add(map);
                 ReViewStateMap.set(stateList);
             });
-            statemap.put(item.getId(),ReViewStateMap.get());
+            statemap.put(item.getId(), ReViewStateMap.get());
 
             MonthTableNameHandler.removeData();
         });
         return statemap;
     }
+
     @Override
-    public Map<String,Object> ReViewGYList(List<ZEngineeringGYVo> list){
+    public Map<String, Object> ReViewGYList(List<ZEngineeringGYVo> list) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
-        List<ZEngineeringReview> nodeTypeList=new ArrayList<>();
-        Map<String,Object> statemap=new HashMap<>();
-        AtomicReference<List<Map<String, Object>>> ReViewStateMap= new AtomicReference<>(new ArrayList<>());
-        list.stream().forEach(item->{
+        List<ZEngineeringReview> nodeTypeList = new ArrayList<>();
+        Map<String, Object> statemap = new HashMap<>();
+        AtomicReference<List<Map<String, Object>>> ReViewStateMap = new AtomicReference<>(new ArrayList<>());
+        list.stream().forEach(item -> {
             String date = new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
             MonthTableNameHandler.setData(date);
             LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
             lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
-            List<ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
-            nodeList.stream().forEach(item2->{
+            List<ZEngineeringNode> nodeList = baseMapper.selectList(lqw);
+            nodeList.stream().forEach(item2 -> {
                 LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
-                List<ZEngineeringReview> ReviewList= zEngineeringReviewMapper.selectList(lqw2);
-                if (!ReviewList.isEmpty())
-                {
+                List<ZEngineeringReview> ReviewList = zEngineeringReviewMapper.selectList(lqw2);
+                if (!ReviewList.isEmpty()) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-                if("焊接".equals(item2.getType())&&item.getEnginClassification().equals("室内管线")){
+                if ("焊接".equals(item2.getType()) && item.getEnginClassification().equals("室内管线")) {
                     LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                     lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
-                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                    info.stream().forEach(item3->{
+                    List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3 -> {
                         LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
-                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
-                        material.stream().forEach(item4->{
+                        List<ZEngineeringMaterial> material = zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4 -> {
                             String materialQualityId = item4.getMaterialQuality();
-                            if (materialQualityId != null){
+                            if (materialQualityId != null) {
                                 ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
-                                if(zEnginMaterialQualityVo != null){
+                                if (zEnginMaterialQualityVo != null) {
                                     String type = zEnginMaterialQualityVo.getMaterialType();
-                                    if("0".equals(type)){
+                                    if ("0".equals(type)) {
                                         item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                                    }else if("1".equals(type)){
+                                    } else if ("1".equals(type)) {
                                         item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
                                     }
                                 }
                             }
                         });
                     });
-                }else if("下管".equals(item2.getType())&&item.getEnginClassification().equals("庭院")){
+                } else if ("下管".equals(item2.getType()) && item.getEnginClassification().equals("庭院")) {
                     LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                     lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
-                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                    info.stream().forEach(item3->{
+                    List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3 -> {
                         LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
-                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
-                        material.stream().forEach(item4->{
+                        List<ZEngineeringMaterial> material = zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4 -> {
                             String materialQualityId = item4.getMaterialQuality();
-                            if(materialQualityId != null){
+                            if (materialQualityId != null) {
                                 ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
-                                if(zEnginMaterialQualityVo != null){
+                                if (zEnginMaterialQualityVo != null) {
                                     String type = zEnginMaterialQualityVo.getMaterialType();
-                                    if("0".equals(type)){
+                                    if ("0".equals(type)) {
                                         item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                                    }else if("1".equals(type)){
+                                    } else if ("1".equals(type)) {
                                         item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
                                     }
                                 }
@@ -1049,45 +1055,46 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 }
             });
             String flag = null;
-            if (item.getEnginClassification().equals("室内管线")){
+            if (item.getEnginClassification().equals("室内管线")) {
                 flag = "gy_inner";
             }
-            if (item.getEnginClassification().equals("庭院")){
+            if (item.getEnginClassification().equals("庭院")) {
                 flag = "gy_out";
             }
-            if (item.getEnginClassification().equals("架空管线")){
+            if (item.getEnginClassification().equals("架空管线")) {
                 flag = "gy_jkgx";
             }
-            if (item.getEnginClassification().equals("每日施工日志")){
+            if (item.getEnginClassification().equals("每日施工日志")) {
                 flag = "gy_log_every_day";
             }
-            if (item.getEnginClassification().equals("调压柜")){
+            if (item.getEnginClassification().equals("调压柜")) {
                 flag = "gy_tyg";
             }
-            List stateList=new ArrayList();
+            List stateList = new ArrayList();
             sysDictMap.get(flag).stream().forEach(item3 -> {
-                Map<String,Object> map=new HashMap<>();
-                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():"暂未审核");
-                    if(!ObjectUtils.isEmpty(nodeTypeList)){
+                Map<String, Object> map = new HashMap<>();
+                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() : "暂未审核");
+                    if (!ObjectUtils.isEmpty(nodeTypeList)) {
                         LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                         lqw3.eq(StringUtils.isNotBlank(nodeTypeList.get(0).getId()), ZEngineeringInfo::getEngInfoId, nodeTypeList.get(0).getId());
-                        List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                        if(!ObjectUtils.isEmpty(info)){
-                            map.put("Type",item3.getDictValue());
-                            map.put("state","0");
-                            map.put("content","暂未审核");
+                        List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                        if (!ObjectUtils.isEmpty(info)) {
+                            map.put("Type", item3.getDictValue());
+                            map.put("state", "0");
+                            map.put("content", "暂未审核");
                         }
                     }
-                }else {
-                    map.put("Type",item3.getDictValue());
-                    map.put("state","-1");
-                    map.put("content","无数据");
+                } else {
+                    map.put("Type", item3.getDictValue());
+                    map.put("state", "-1");
+                    map.put("content", "无数据");
                 }
                 stateList.add(map);
-                ReViewStateMap.set(stateList);;
+                ReViewStateMap.set(stateList);
+                ;
             });
             statemap.put(item.getId(), ReViewStateMap.get());
 
@@ -1107,28 +1114,27 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             MonthTableNameHandler.setData(date);
             LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
             lqw.eq(!ObjectUtils.isEmpty(item.getId()), ZEngineeringNode::getCivliId, item.getId());
-            List<ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
-            nodeList.stream().forEach(item2->{
+            List<ZEngineeringNode> nodeList = baseMapper.selectList(lqw);
+            nodeList.stream().forEach(item2 -> {
                 LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
-                List<ZEngineeringReview> ReviewList= zEngineeringReviewMapper.selectList(lqw2);
-                if (!ReviewList.isEmpty())
-                {
+                List<ZEngineeringReview> ReviewList = zEngineeringReviewMapper.selectList(lqw2);
+                if (!ReviewList.isEmpty()) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
             });
             List stateList = new ArrayList();
             String dists = item.getModeOperation();
-            if ("地埋扳孔".equals(item.getModeOperation())){
-                dists="bury_the_wrench_hole";
-            }else if ("架空扳孔".equals(item.getModeOperation())){
-                dists="aerial_wrench_hole";
-            }else if ("停气作业".equals(item.getModeOperation())){
-                dists="shutdown_operation";
-            }else if ("PE 封堵".equals(item.getModeOperation())){
-                dists="pe_plugging";
-            }else if ("钢管带气封堵".equals(item.getModeOperation())){
-                dists="the_steel_pipe_sealed_with_gas";
+            if ("地埋扳孔".equals(item.getModeOperation())) {
+                dists = "bury_the_wrench_hole";
+            } else if ("架空扳孔".equals(item.getModeOperation())) {
+                dists = "aerial_wrench_hole";
+            } else if ("停气作业".equals(item.getModeOperation())) {
+                dists = "shutdown_operation";
+            } else if ("PE 封堵".equals(item.getModeOperation())) {
+                dists = "pe_plugging";
+            } else if ("钢管带气封堵".equals(item.getModeOperation())) {
+                dists = "the_steel_pipe_sealed_with_gas";
             }
             sysDictMap.get(dists).forEach(item3 -> {
                 Map<String, Object> map = new HashMap<>();
@@ -1136,20 +1142,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                     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() : "暂未审核");
-                    if(!ObjectUtils.isEmpty(nodeTypeList)){
+                    if (!ObjectUtils.isEmpty(nodeTypeList)) {
                         LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
                         lqw3.eq(StringUtils.isNotBlank(nodeTypeList.get(0).getId()), ZEngineeringInfo::getEngInfoId, nodeTypeList.get(0).getId());
-                        List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                        if(!ObjectUtils.isEmpty(info)){
-                            map.put("Type",item3.getDictValue());
-                            map.put("state","0");
-                            map.put("content","暂未审核");
+                        List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                        if (!ObjectUtils.isEmpty(info)) {
+                            map.put("Type", item3.getDictValue());
+                            map.put("state", "0");
+                            map.put("content", "暂未审核");
                         }
                     }
-                }else {
-                    map.put("Type",item3.getDictValue());
-                    map.put("state","-1");
-                    map.put("content","无数据");
+                } else {
+                    map.put("Type", item3.getDictValue());
+                    map.put("state", "-1");
+                    map.put("content", "无数据");
                 }
                 stateList.add(map);
                 ReViewStateMap.set(stateList);
@@ -1183,13 +1189,13 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 lqw3.orderByDesc(ZEngineeringInfo::getUpdateInfoTime);
                 List<ZEngineeringInfo> infoList = zEngineeringInfoMapper.selectList(lqw3);
                 List<String> infostateList = infoList.stream().map(ZEngineeringInfo::getState).collect(Collectors.toList());
-                if("底腿".equals(item2.getType())){
-                    if(infostateList.size()>0&&!infostateList.contains(null)&&!infostateList.contains("")){
+                if ("底腿".equals(item2.getType())) {
+                    if (infostateList.size() > 0 && !infostateList.contains(null) && !infostateList.contains("")) {
                         if (ReviewList.size() > 0) {
                             String content = "";
-                            for (int i=0;i<infoList.size();i++){
-                                if(StringUtils.isNotBlank(infoList.get(i).getContent())){
-                                    content+=(i+1)+"、"+(infoList.get(i).getContent())+";";
+                            for (int i = 0; i < infoList.size(); i++) {
+                                if (StringUtils.isNotBlank(infoList.get(i).getContent())) {
+                                    content += (i + 1) + "、" + (infoList.get(i).getContent()) + ";";
                                 }
                             }
                             ZEngineeringReview ifhave = new ZEngineeringReview();
@@ -1198,11 +1204,11 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                             ifhave.setReviewContent(content);
                             nodeTypeList.add(ifhave);
                         }
-                    }else{
+                    } else {
                         LambdaQueryWrapper<ZEngiineeringPhoto> lqw4 = Wrappers.lambdaQuery();
-                        lqw4.eq(!ObjectUtils.isEmpty(infoList),ZEngiineeringPhoto::getParentId, infoList.get(0).getId());
+                        lqw4.eq(!ObjectUtils.isEmpty(infoList), ZEngiineeringPhoto::getParentId, infoList.get(0).getId());
                         List<String> photoList = izEngiineeringPhotoMapper.selectList(lqw4).stream().map(ZEngiineeringPhoto::getType).collect(Collectors.toList());
-                        if (photoList.size()>0 && (!photoList.contains("onTheDitch")||!photoList.contains("beforeBottom")||!photoList.contains("inferiorSulcus")||!photoList.contains("legBackfilling"))) {
+                        if (photoList.size() > 0 && (!photoList.contains("onTheDitch") || !photoList.contains("beforeBottom") || !photoList.contains("inferiorSulcus") || !photoList.contains("legBackfilling"))) {
                             ZEngineeringReview ifhave = new ZEngineeringReview();
                             ifhave.setEngInfoId(item2.getId());
                             ifhave.setReviewStatus("99");
@@ -1210,26 +1216,25 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                             nodeTypeList.add(ifhave);
                         }
                     }
-                }
-                else{
-                    if(!ObjectUtils.isEmpty(infoList) && "99".equals(infoList.get(0).getState())){
+                } 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()){
+                    } else if (infoList.isEmpty()) {
                         ZEngineeringReview ifhave = new ZEngineeringReview();
                         ifhave.setEngInfoId(item2.getId());
                         ifhave.setReviewStatus("-1");
                         ifhave.setReviewContent("无数据");
                         nodeTypeList.add(ifhave);
-                    }else{
+                    } else {
                         if (ReviewList.size() > 0) {
                             String content = "";
-                            for (int i=0;i<infoList.size();i++){
-                                if(StringUtils.isNotBlank(infoList.get(i).getContent())){
-                                    content+=(i+1)+"、"+(infoList.get(i).getContent())+";";
+                            for (int i = 0; i < infoList.size(); i++) {
+                                if (StringUtils.isNotBlank(infoList.get(i).getContent())) {
+                                    content += (i + 1) + "、" + (infoList.get(i).getContent()) + ";";
                                 }
                             }
                             ZEngineeringReview ifhave = new ZEngineeringReview();
@@ -1251,35 +1256,34 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             if (list != null && !list.isEmpty()) {
                 list.stream().forEach(item3 -> {
                     Map<String, Object> map = new HashMap<>();
-//                    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() : "暂未审核");
-//                    } else {
-//                        map.put("Type", item3.getDictValue());
-//                        map.put("state", "0");
-//                        map.put("content", "暂未审核");
-//                    }
-                    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(): "暂未审核");
-                        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())){
+                    //                    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() : "暂未审核");
+                    //                    } else {
+                    //                        map.put("Type", item3.getDictValue());
+                    //                        map.put("state", "0");
+                    //                        map.put("content", "暂未审核");
+                    //                    }
+                    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() : "暂未审核");
+                        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();
                             lqw3.eq(ZEngineeringInfo::getEngInfoId, enginfoid);
-                            List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                            if(ObjectUtils.isEmpty(info)){
-                                map.put("Type",item3.getDictValue());
-                                map.put("state","-1");
-                                map.put("content","无数据");
+                            List<ZEngineeringInfo> info = zEngineeringInfoMapper.selectList(lqw3);
+                            if (ObjectUtils.isEmpty(info)) {
+                                map.put("Type", item3.getDictValue());
+                                map.put("state", "-1");
+                                map.put("content", "无数据");
                             }
                         }
-                    }else {
-                        map.put("Type",item3.getDictValue());
-                        map.put("state","-1");
-                        map.put("content","无数据");
+                    } else {
+                        map.put("Type", item3.getDictValue());
+                        map.put("state", "-1");
+                        map.put("content", "无数据");
                     }
                     stateList.add(map);
                     ReViewStateMap.set(stateList);
@@ -1316,9 +1320,9 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
                 List<ZEngineeringReview> ReviewList = zEngineeringReviewMapper.selectList(lqw2);
-                    if (ReviewList.size() > 0) {
-                        nodeTypeList.add(ReviewList.get(0));
-                    }
+                if (ReviewList.size() > 0) {
+                    nodeTypeList.add(ReviewList.get(0));
+                }
             });
             List stateList = new ArrayList();
             List<SysDictData> list = Collections.EMPTY_LIST;