修改用料获取

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginMaterialQualityController.java

@@ -51,7 +51,7 @@ public class ZEnginMaterialQualityController extends BaseController {
      * 工程材质下拉
      */
     @GetMapping("/getEnginMaterialQualityList")
-    public R getEnginMaterialQualityList(String enginType) {
+    public R getEnginMaterialQualityList(ZEnginMaterialQualityBo enginType) {
         return R.ok(iZEnginMaterialQualityService.getEnginMaterialQualityList(enginType));
     }
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEnginMaterialQualityMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.mapper;
 
 import com.ruoyi.zdsz.domain.ZEnginMaterialQuality;
+import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
 import com.ruoyi.zdsz.domain.vo.ZEnginMaterialQualityVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
@@ -14,5 +15,5 @@ import java.util.List;
  */
 public interface ZEnginMaterialQualityMapper extends BaseMapperPlus<ZEnginMaterialQualityMapper, ZEnginMaterialQuality, ZEnginMaterialQualityVo> {
 
-    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType);
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(ZEnginMaterialQualityBo enginType);
 }

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

@@ -48,5 +48,5 @@ public interface IZEnginMaterialQualityService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType);
+    List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(ZEnginMaterialQualityBo enginType);
 }

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

@@ -145,7 +145,7 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
     }
 
     @Override
-    public List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(String enginType) {
+    public List<ZEnginMaterialQualityVo> getEnginMaterialQualityList(ZEnginMaterialQualityBo enginType) {
         return baseMapper.getEnginMaterialQualityList(enginType);
     }
 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEnginMaterialQualityMapper.xml

@@ -23,6 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enginType != null and enginType != ''">
                 and zc.engin_type LIKE CONCAT('%',#{enginType},'%')
             </if>
+            <if test="enginSort != null and enginSort != ''">
+                and zc.engin_sort = #{enginSort}
+            </if>
+            <if test="enginNode != null and enginNode != ''">
+                and zc.engin_node = #{enginNode}
+            </if>
         </where>
         order by zc.create_time desc
     </select>