Merge remote-tracking branch 'origin/test' into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java

@@ -121,4 +121,13 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     
     @Schema(description = "部门id")
     private Long deptId;
+    
+    //=========扩展字段==========
+
+	/** 分析方法名称 **/
+    @Schema(description = "分析方法")
+    private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java

@@ -62,6 +62,8 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getConfigAssayMethodName())
+                .likeIfPresent(ConfigAssayMethodDO::getMethodNameCategory, reqVO.getConfigAssayMethodNameAndCategory())
                 .neIfPresent(BusinessAssayTaskDO::getAssayOperator, reqVO.getNeAssayOperator())
                 .eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
                 .orderByDesc(BusinessAssayTaskDO::getId));
@@ -107,6 +109,8 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .eqIfPresent(BusinessAssayTaskDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(ConfigAssayMethodDO::getName, reqVO.getConfigAssayMethodName())
+                .likeIfPresent(ConfigAssayMethodDO::getMethodNameCategory, reqVO.getConfigAssayMethodNameAndCategory())
                 .eqIfPresent(BusinessAssayTaskDO::getDeptId, reqVO.getDeptId())
                 .neIfPresent(BusinessAssayTaskDO::getAssayOperator, reqVO.getNeAssayOperator())
                 .orderByDesc(BusinessAssayTaskDO::getId));