Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEnginMaterialQuality.java

@@ -43,5 +43,6 @@ public class ZEnginMaterialQuality extends BaseEntity {
     private String enginSort;
     private String enginNode;
     private String enginStep;
+    private String nameType;
 
 }

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

@@ -35,6 +35,7 @@ public class ZEnginMaterialQualityBo extends BaseEntity {
     private String enginSort;
     private String enginNode;
     private String enginStep;
+    private String nameType;
 
     /**
      * 材质名称

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEnginMaterialQualityVo.java

@@ -45,5 +45,6 @@ public class ZEnginMaterialQualityVo implements Serializable {
     private String enginSort;
     private String enginNode;
     private String enginStep;
+    private String nameType;
 
 }

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

@@ -94,6 +94,7 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
         lqw.eq(StringUtils.isNotBlank(bo.getEnginSort()), ZEnginMaterialQuality::getEnginSort, bo.getEnginSort());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginNode()), ZEnginMaterialQuality::getEnginNode, bo.getEnginNode());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginStep()), ZEnginMaterialQuality::getEnginStep, bo.getEnginStep());
+        lqw.eq(StringUtils.isNotBlank(bo.getNameType()), ZEnginMaterialQuality::getNameType, bo.getNameType());
         return lqw;
     }
 

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

@@ -32,6 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enginStep != null and enginStep != ''">
                 and zc.engin_step = #{enginStep}
             </if>
+            <if test="nameType != null and nameType != ''">
+                and zc.name_type = #{nameType}
+            </if>
         </where>
         order by zc.create_time desc
     </select>