Browse Source

只统计

wangzhe 11 months ago
parent
commit
c84e108970

+ 9 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringWasteMaterialServiceImpl.java

@@ -552,6 +552,9 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             AtomicReference<BigDecimal> gsj = new AtomicReference<>(new BigDecimal(0));
             for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
                 ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
+                if((zEngineeringGYVo.getEnginClassification().equals("室外管线") && !nodeBo.getType().equals("下管")) || (zEngineeringGYVo.getEnginClassification().equals("室内管线") && !nodeBo.getType().equals("焊接"))){ // 工业工程室外管线只算下管、工业工程室内管线只算焊接
+                    continue;
+                }
                 for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {
                     System.out.println(info.getzEngineeringMaterialBo());
                     LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
@@ -623,6 +626,9 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             AtomicReference<BigDecimal> gsj = new AtomicReference<>(new BigDecimal(0));
             for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
                 ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
+                if(!nodeBo.getType().equals("下管")){ // 市政只算下管的
+                    continue;
+                }
                 for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {
                     System.out.println(info.getzEngineeringMaterialBo());
                     LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
@@ -684,6 +690,9 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             AtomicReference<BigDecimal> gsj = new AtomicReference<>(new BigDecimal(0));
             for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
                 ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
+                if(!nodeBo.getType().equals("回拖")){ // 顶管只算回拖的
+                    continue;
+                }
                 for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {
                     System.out.println(info.getzEngineeringMaterialBo());
                     LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();