提交代码

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

@@ -87,6 +87,7 @@ public interface IZEngineeringNodeService {
     Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList);
     Map<String,Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> 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/ZEngineeringIndustryServiceImpl.java

@@ -254,7 +254,11 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     public TableDataInfo<ZEngineeringIndustryVo> queryPageList(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = buildQueryWrapper(bo);
         Page<ZEngineeringIndustryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        Map<String, Object> ReviewList = nodeService.ReViewSZList(result.getRecords());
+        Map<String, Object> ReviewList;
+        if ("1".equals(bo.getType()))
+            ReviewList = nodeService.ReViewGYList(result.getRecords());
+        else
+            ReviewList = nodeService.ReViewSZList(result.getRecords());
         result.getRecords().forEach(item -> {
             item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });

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

@@ -793,6 +793,46 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
+    public Map<String, Object> ReViewGYList(List<ZEngineeringIndustryVo> list) {
+
+        List<ZEngineeringReview> nodeTypeList=new ArrayList<>();
+        Map<String,Object> statemap=new HashMap<>();
+        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());
+            Map<String,Object> map=new HashMap<>();
+            if (nodeList.size()>0&&nodeList.stream().anyMatch(x->x.getType().equals("工业工程"))){
+                map.put("Type","工业工程");
+                map.put("state",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals("工业工程")).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals("工业工程")).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("工业工程")).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals("工业工程")).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent():"暂未审核");
+            }else {
+                map.put("Type","工业工程");
+                map.put("state","0");
+                map.put("content","暂未审核");
+            }
+            statemap.put(item.getId(),Arrays.asList(map));
+            MonthTableNameHandler.removeData();
+        });
+        return statemap;
+    }
+
+    @Override
     public Map<String,Object> ReViewSZList(List<ZEngineeringIndustryVo> list){
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringReview> nodeTypeList=new ArrayList<>();