审核添加状态

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringNodeService.java

@@ -81,7 +81,7 @@ public interface IZEngineeringNodeService {
     Boolean updateMuch(ZEngineeringNodeBo bo);
     Boolean delete(ZEngineeringNodeBo bo);
     List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type);
-    List<Map<String,Object>> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList);
+    Map<String,Object> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList);
 
     /**
      * 校验并批量删除工程节点信息

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

@@ -170,20 +170,16 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 return TableDataInfo.build(result);
             }
           result = baseMapper.queryPageIdList(IDList, IDList.size(), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
-            List<Map<String,Object>> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectList(lqw));
+            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectList(lqw));
             result.getRecords().forEach(item->{
-                ReviewList.stream().forEach(item2->{
-                    item.setNodeReViewStateList(item2.get(item.getId()));
-                });
+                    item.setNodeReViewStateList(ReviewList.get(item.getId()));
             });
             return TableDataInfo.build(result);
         }
         result = baseMapper.queryPageList(bo, page, pageQuery.getPageNum() - 1, pageQuery.getPageSize());
-        List<Map<String,Object>> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectList(lqw));
+        Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectList(lqw));
         result.getRecords().forEach(item->{
-            ReviewList.stream().forEach(item2->{
-                item.setNodeReViewStateList(item2.get(item.getId()));
-            });
+                item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });
         page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
         return TableDataInfo.build(result);

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

@@ -475,9 +475,10 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
-    public List<Map<String,Object>> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList) {
+    public Map<String,Object> ReViewList(List<ZEngineeringCivil> zEngineeringCivilList) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringNode> nodeTypeList=new ArrayList<>();
+        Map<String,Object> statemap=new HashMap<>();
         List<Map<String,Object>> ReViewMap=new ArrayList<>();
         AtomicReference<List<Map<String, Object>>> ReViewStateMap= new AtomicReference<>(new ArrayList<>());
         zEngineeringCivilList.stream().forEach(item->{
@@ -489,7 +490,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             List <ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
             nodeTypeList.addAll(nodeList);
             nodeList.stream().forEach(item2->{
-                ReViewStateMap.get().clear();
+                List stateList=new ArrayList();
                 LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
                 List<ZEngineeringReview> ReviewList= zEngineeringReviewMapper.selectList(lqw2);
@@ -503,18 +504,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                             map.put("Type",item3.getDictValue());
                             map.put("state","0");
                         }
-                        ReViewStateMap.get().add(map);
+                        stateList.add(map);
+
                     });
+                ReViewStateMap.set(stateList);;
 
             });
-            Map<String,Object> statemap=new HashMap<>();
-            statemap.put(item.getId(),ReViewStateMap);
-            ReViewMap.add(statemap);
+
+            List stateList=ReViewStateMap.get();
+            statemap.put(item.getId(),stateList);
             MonthTableNameHandler.removeData();
 
         });
 
-        return ReViewMap;
+        return statemap;
     }