提交代码

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

@@ -1002,6 +1002,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         Map<Long, 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(!ObjectUtils.isEmpty(item.getId()), ZEngineeringNode::getCivliId, item.getId());
+            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())
+                {
+                    nodeTypeList.add(ReviewList.get(0));
+                }
+            });
             List stateList = new ArrayList();
             String dists = "";
             if ("地埋扳孔".equals(item.getModeOperation())){
@@ -1017,13 +1031,20 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             }
             sysDictMap.get(dists).stream().forEach(item3 -> {
                 Map<String, Object> map = new HashMap<>();
-                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() : "暂未审核");
+                } else {
+                    map.put("Type", item3.getDictValue());
+                    map.put("state", "0");
+                    map.put("content", "暂未审核");
+                }
                 stateList.add(map);
-
+                ReViewStateMap.set(stateList);
             });
-            statemap.put(item.getId(), stateList);
+
+            statemap.put(item.getId(), ReViewStateMap.get());
             MonthTableNameHandler.removeData();
         });
         return statemap;