工程名称 工程材质

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEnginMaterialQualityBo.java

@@ -37,12 +37,14 @@ public class ZEnginMaterialQualityBo extends BaseEntity {
     private String enginStep;
     private String nameType;
     private String materialType;
+    private String materialStatistics; // 用料材质
 
     /**
      * 材质名称
      */
     @NotBlank(message = "材质名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
+    private String enginName; // 工程名称
 
 
 }

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

@@ -532,8 +532,11 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         LambdaQueryWrapper<ZEngineeringGY> lqw = Wrappers.lambdaQuery();
 //        LambdaQueryWrapper<TestDemo> lqw = Wrappers.lambdaQuery();
 //        lqw.like(StringUtils.isNotBlank(bo.getTestKey()), TestDemo::getTestKey, bo.getTestKey());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginSort()), ZEngineeringGY::getEnginClassification, bo.getEnginSort());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGY::getEnginName, bo.getEnginName()); // 工程名称
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginSort()), ZEngineeringGY::getEnginClassification, bo.getEnginSort()); // 工程分类
+//        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType()); // 工程类型
+//        lqw.eq(StringUtils.isNotBlank(bo.getMaterialQuality()), ZEngineeringGY::getEnginClassification, bo.getEnginSort()); // 用料材质
+        lqw.eq(StringUtils.isNotBlank(bo.getMaterialStatistics()), ZEngineeringGY::getEnginClassification, bo.getEnginSort()); // 用料材质
         List<ZEngineeringGYVo> list = gyMapper.selectVoList(lqw);
 //        List<Map> mapList = new ArrayList<>();
         List<WasteMaterialVo> resultList = new ArrayList<>();