提交代码

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringInfrastructureVo.java

@@ -27,6 +27,15 @@ import java.util.List;
 public class ZEngineeringInfrastructureVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    private Object nodeReViewStateList;
+
+    public Object getNodeReViewStateList() {
+        return nodeReViewStateList;
+    }
+
+    public void setNodeReViewStateList(Object nodeReViewStateList) {
+        this.nodeReViewStateList = nodeReViewStateList;
+    }
 
     /**
      * ID

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

@@ -86,6 +86,7 @@ public interface IZEngineeringNodeService {
     List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type,String state,ZEngineeringCivilBo bo);
     Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList);
     Map<String,Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> list);
+    Map<String,Object> ReViewInfrastructureList(List<ZEngineeringInfrastructureVo> list);
     Map<String,Object> ReViewSZList(List<ZEngineeringIndustryVo> list);
     Map<String,Object> ReViewGYList(List<ZEngineeringIndustryVo> list);
 

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

@@ -104,6 +104,10 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     public TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
         Page<ZEngineeringInfrastructureVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Map<String, Object> ReviewList = izEngineeringNodeService.ReViewInfrastructureList(result.getRecords());
+        result.getRecords().forEach(item -> {
+            item.setNodeReViewStateList(ReviewList.get(item.getId()));
+        });
         return TableDataInfo.build(result);
     }
 

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

@@ -746,6 +746,52 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
+    public Map<String, Object> ReViewInfrastructureList(List<ZEngineeringInfrastructureVo> 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->{
+            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());
+            // lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
+            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.size()>0)
+                {
+                    nodeTypeList.add(ReviewList.get(0));
+                }
+
+            });
+            System.out.println(nodeList.toString());
+            System.out.println(nodeTypeList.toString());
+            List stateList=new ArrayList();
+            sysDictMap.get("engineering_infrastructure").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","暂未审核");
+                }
+                stateList.add(map);
+                ReViewStateMap.set(stateList);;
+            });
+            statemap.put(item.getId(),ReViewStateMap.get());
+
+            MonthTableNameHandler.removeData();
+        });
+        return statemap;
+    }
+    @Override
     public Map<String, Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> list) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringReview> nodeTypeList=new ArrayList<>();