审核添加状态

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

@@ -170,7 +170,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 return TableDataInfo.build(result);
             }
           result = baseMapper.queryPageIdList(IDList, IDList.size(), page,pageQuery.getPageNum() - 1, pageQuery.getPageSize());
-            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(baseMapper.selectVoList(lqw));
+            Map<String,Object> ReviewList=zEngineeringNodeService.ReViewList(result.getRecords());
             result.getRecords().forEach(item->{
                     item.setNodeReViewStateList(ReviewList.get(item.getId()));
             });

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

@@ -478,7 +478,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     @Override
     public Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
-        List<ZEngineeringNode> nodeTypeList=new ArrayList<>();
+        List<ZEngineeringReview> 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<>());
@@ -489,31 +489,55 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
            // lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
             List <ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
-            nodeTypeList.addAll(nodeList);
             nodeList.stream().forEach(item2->{
-                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);
-                    sysDictMap.get(item.getEnginType()+"_"+item.getEnginClassification()).stream().forEach(item3 -> {
-                        Map<String,Object> map=new HashMap<>();
-                        if (item2.getType().equals(item3.getDictValue()))
+                if (ReviewList.size()>0)
+                {
+                    nodeTypeList.add(ReviewList.get(0));
+                }
+//                    sysDictMap.get(item.getEnginType()+"_"+item.getEnginClassification()).stream().forEach(item3 -> {
+//                        Map<String,Object> map=new HashMap<>();
+////                        if (item2.getType().equals(item3.getDictValue()))
+////                        {
+//                                map.put("Type",item2.getType());
+//                                if (ReviewList.size()>0)
+//                                {
+//                                    nodeTypeList.add(ReviewList.get(0));
+//                                }
+//
+//                                map.put("state",ReviewList.size()>0?ReviewList.get(0).getReviewStatus():"0");
+////                        }
+////                        else {
+////                            map.put("Type",item3.getDictValue());
+////                            map.put("state","0");
+////                        }
+//                        stateList.add(map);
+//
+//                    });
+//                System.out.println(stateList);
+//                ReViewStateMap.set(stateList);;
+
+            });
+            List stateList=new ArrayList();
+            sysDictMap.get(item.getEnginType()+"_"+item.getEnginClassification()).stream().forEach(item3 -> {
+                Map<String,Object> map=new HashMap<>();
+                System.out.println(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()));
+                        if (nodeList.stream().anyMatch(x->x.getType().equals(item3.getDictValue())))
                         {
-                                map.put("Type",item2.getType());
-                                map.put("state",ReviewList.size()>0?ReviewList.get(0).getReviewStatus():"0");
-                        }else {
+                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");
+                        }
+                        else {
                             map.put("Type",item3.getDictValue());
                             map.put("state","0");
                         }
-                        stateList.add(map);
-
-                    });
+                stateList.add(map);
                 ReViewStateMap.set(stateList);;
-
             });
-
-            List stateList=ReViewStateMap.get();
-            statemap.put(item.getId(),stateList);
+            statemap.put(item.getId(),ReViewStateMap.get());
             MonthTableNameHandler.removeData();
 
         });