提交用料比例计算

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

@@ -88,8 +88,7 @@ public interface IZEngineeringNodeService {
     Map<String,Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> list);
     Map<String,Object> ReViewInfrastructureList(List<ZEngineeringInfrastructureVo> list);
     Map<String,Object> ReViewSZList(List<ZEngineeringIndustryVo> list);
-    Map<String,Object> ReViewGList(List<ZEngineeringGYVo> list);
-    Map<String,Object> ReViewGYList(List<ZEngineeringIndustryVo> list);
+    Map<String,Object> ReViewGYList(List<ZEngineeringGYVo> list);
     Map<Long,Object> ReViewPKList(List<ZTouchOperationEngineeringVo> list);
     /**
      * 校验并批量删除工程节点信息

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

@@ -88,7 +88,7 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         LambdaQueryWrapper<ZEngineeringGY> lqw = buildQueryWrapper(bo);
         Page<ZEngineeringGYVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Map<String, Object> ReviewList;
-        ReviewList = nodeService.ReViewGList(result.getRecords());
+        ReviewList = nodeService.ReViewGYList(result.getRecords());
         result.getRecords().forEach(item -> {
             item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });

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

@@ -832,45 +832,6 @@ 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<>();
@@ -889,7 +850,24 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 if (ReviewList.size() > 0) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-
+                if("下管".equals(item2.getType())){
+                    LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
+                    lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
+                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3->{
+                        LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
+                        lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
+                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4->{
+                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
+                            if("0".equals(type)){
+                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }else if("1".equals(type)){
+                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }
+                        });
+                    });
+                }
             });
             List stateList = new ArrayList();
             sysDictMap.get("municipal_node_types").stream().forEach(item3 -> {
@@ -914,7 +892,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         return statemap;
     }
     @Override
-    public Map<String,Object> ReViewGList(List<ZEngineeringGYVo> list){
+    public Map<String,Object> ReViewGYList(List<ZEngineeringGYVo> list){
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringReview> nodeTypeList=new ArrayList<>();
         Map<String,Object> statemap=new HashMap<>();
@@ -1056,24 +1034,6 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 if (ReviewList.size() > 0) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-                if("下管".equals(item2.getType())){
-                    LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
-                    lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
-                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
-                    info.stream().forEach(item3->{
-                        LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
-                        lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
-                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
-                        material.stream().forEach(item4->{
-                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                            if("0".equals(type)){
-                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                            }else if("1".equals(type)){
-                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                            }
-                        });
-                    });
-                }
             });
             List stateList = new ArrayList();
             List<SysDictData> list = sysDictMap.get(item.getEnginType() + "_" + item.getEnginClassification());