wangzhe 11 ヶ月 前
コミット
769d672615

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

@@ -143,6 +143,9 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
             ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
             for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {
+                if((zEngineeringGYVo.getEnginClassification().equals("室外管线") && !nodeBo.getType().equals("下管")) || (zEngineeringGYVo.getEnginClassification().equals("室内管线") && !nodeBo.getType().equals("焊接"))){ // 工业工程室外管线只算下管、工业工程室内管线只算焊接
+                    continue;
+                }
                 System.out.println(info.getzEngineeringMaterialBo());
                 LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
                 lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
@@ -321,6 +324,9 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
             ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
             for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {
+                if(!nodeBo.getType().equals("下管")){ // 市政只算下管的
+                    continue;
+                }
                 System.out.println(info.getzEngineeringMaterialBo());
                 LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
                 lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
@@ -410,6 +416,9 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         for (int i = 0; i < zEngineeringNodeBos.size(); i++) {
             ZEngineeringNodeBo nodeBo = zEngineeringNodeBos.get(i);
             for (ZEngineeringInfoBo info: nodeBo.getzEngineeringInfoBoList()) {
+                if(!nodeBo.getType().equals("回拖")){ // 顶管只算回拖的
+                    continue;
+                }
                 System.out.println(info.getzEngineeringMaterialBo());
                 LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
                 lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());