任务分配调整

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

@@ -42,6 +42,9 @@ public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
     
     /** 动态表单值 **/
     private String formValue;
+
+    /** 质量控制分析方法 **/
+    private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
     
     /** 分配任务的分析数据 **/
     private List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList;

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

@@ -0,0 +1,47 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 质控样检测系数参数业务分页 Request VO")
+@Data
+public class BusinessQCCoefficientParameterDataReqVO {
+
+    @Schema(description = "检测项目业务ID", example = "23013")
+    private Long businessQCCoefficientDataId;
+
+    @Schema(description = "质控样检测方法参数配置ID", example = "870")
+    private Long configQCSampleMethodParameterId;
+
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "7977")
+    private Long dictionaryParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "25016")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,47 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 质控样检测参数数据业务分页 Request VO")
+@Data
+public class BusinessQCManagementParameterDataReqVO extends PageParam {
+
+    @Schema(description = "检测项目业务ID", example = "23428")
+    private Long businessQCManagementProjectDataId;
+
+    @Schema(description = "检测方法分析项目参数配置表ID", example = "12018")
+    private Long configAssayMethodProjectParameterId;
+
+    @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "18162")
+    private Long dictionaryParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "18772")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,59 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 质控样检测项目数据业务分页 Request VO")
+@Data
+public class BusinessQCManagementProjectDataReqVO {
+
+    @Schema(description = "检测任务ID", example = "940")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法分析项目配置ID", example = "413")
+    private Long configAssayMethodProjectId;
+
+    @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "3746")
+    private Long dictionaryProjectId;
+
+    @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出、quality_control-品质控制")
+    private String usage;
+
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "是否不参与超差判定")
+    private Integer isNotAssessment;
+
+    @Schema(description = "是否启用")
+    private Integer isEnabled;
+
+    @Schema(description = "乐观锁", example = "10206")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -72,4 +72,10 @@ public interface BusinessQCCoefficientDataMapper extends BaseMapperX<BusinessQCC
 				.eq(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, businessAssayTaskId));
 	}
 
+	default List<BusinessQCCoefficientDataDO> selectByBusinessAssayTaskIdAndDictionaryBusinessKey(Long businessAssayTaskId, String dictionaryBusinessKey) {
+		return selectList(new LambdaQueryWrapperX<BusinessQCCoefficientDataDO>()
+				.eq(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, businessAssayTaskId)
+				.eq(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, dictionaryBusinessKey));
+	}
+
 }

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

@@ -4,8 +4,13 @@ import java.util.*;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAndParameterRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataPageReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodParameterDO;
+import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryParameterDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -31,5 +36,36 @@ public interface BusinessQCCoefficientParameterDataMapper extends BaseMapperX<Bu
                 .eqIfPresent(BusinessQCCoefficientParameterDataDO::getRemark, reqVO.getRemark())
                 .orderByDesc(BusinessQCCoefficientParameterDataDO::getId));
     }
+    
+    default List<BusinessAssayProjectAndParameterRespVO> selectProjectAndParameterBy(BusinessQCCoefficientParameterDataReqVO reqVO) {
+    	return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessQCCoefficientParameterDataDO>()
+    			.leftJoin(ConfigQCSampleMethodParameterDO.class, ConfigQCSampleMethodParameterDO::getId, BusinessQCCoefficientParameterDataDO::getConfigQCSampleMethodParameterId)
+				.leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, BusinessQCCoefficientParameterDataDO::getDictionaryParameterId)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getDictionaryParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(DictionaryParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(DictionaryParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(DictionaryParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigQCSampleMethodParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				.selectAs(ConfigQCSampleMethodParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigQCSampleMethodParameterDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'parameter'", BusinessAssayProjectAndParameterRespVO::getType)
+				.eqIfPresent(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, reqVO.getBusinessQCCoefficientDataId())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getConfigQCSampleMethodParameterId, reqVO.getConfigQCSampleMethodParameterId())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDictionaryParameterId, reqVO.getDictionaryParameterId())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessQCCoefficientParameterDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessQCCoefficientParameterDataDO::getRemark, reqVO.getRemark())
+                .orderByAsc(ConfigQCSampleMethodParameterDO::getSortNo)); 
+    }
 
 }

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

@@ -66,5 +66,10 @@ public interface BusinessQCManagementDataMapper extends BaseMapperX<BusinessQCMa
                 .eqIfPresent(BusinessQCManagementDataDO::getRemark, reqVO.getRemark())
                 .orderByDesc(BusinessQCManagementDataDO::getId));
 	}
+	
+	default List<BusinessQCManagementDataDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
+		return selectList(new LambdaQueryWrapperX<BusinessQCManagementDataDO>()
+				.eq(BusinessQCManagementDataDO::getBusinessAssayTaskId, businessAssayTaskId));		
+	}
 
 }

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

@@ -4,8 +4,11 @@ import java.util.*;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectParameterDO;
+import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryParameterDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -31,5 +34,36 @@ public interface BusinessQCManagementParameterDataMapper extends BaseMapperX<Bus
                 .eqIfPresent(BusinessQCManagementParameterDataDO::getRemark, reqVO.getRemark())
                 .orderByDesc(BusinessQCManagementParameterDataDO::getId));
     }
+    
+    default List<BusinessAssayProjectAndParameterRespVO> selectProjectAndParameterBy(BusinessQCManagementParameterDataReqVO reqVO) {
+    	return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessQCManagementParameterDataDO>()
+				.leftJoin(ConfigAssayMethodProjectParameterDO.class, ConfigAssayMethodProjectParameterDO::getId, BusinessQCManagementParameterDataDO::getConfigAssayMethodProjectParameterId)
+				.leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, BusinessQCManagementParameterDataDO::getDictionaryParameterId)
+				.selectAs(BusinessQCManagementParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCManagementParameterDataDO::getDictionaryParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(DictionaryParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryParameterDO::getName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(DictionaryParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
+				.selectAs(BusinessQCManagementParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessQCManagementParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessQCManagementParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(DictionaryParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigAssayMethodProjectParameterDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'parameter'", BusinessAssayProjectAndParameterRespVO::getType)
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, reqVO.getBusinessQCManagementProjectDataId())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getConfigAssayMethodProjectParameterId, reqVO.getConfigAssayMethodProjectParameterId())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getDictionaryParameterId, reqVO.getDictionaryParameterId())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessQCManagementParameterDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessQCManagementParameterDataDO::getRemark, reqVO.getRemark())
+                .orderByAsc(ConfigAssayMethodProjectParameterDO::getSortNo));
+    } 
 
 }

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

@@ -4,8 +4,11 @@ import java.util.*;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
+import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -36,4 +39,38 @@ public interface BusinessQCManagementProjectDataMapper extends BaseMapperX<Busin
                 .orderByDesc(BusinessQCManagementProjectDataDO::getId));
     }
 
+	default List<BusinessAssayProjectAndParameterRespVO> selectProjectAndParameterBy(BusinessQCManagementProjectDataReqVO reqVO) {
+		return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessQCManagementProjectDataDO>()
+				.leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessQCManagementProjectDataDO::getConfigAssayMethodProjectId)
+				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessQCManagementProjectDataDO::getDictionaryProjectId)
+				.selectAs(BusinessQCManagementProjectDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCManagementProjectDataDO::getDictionaryProjectId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				//.selectAs(DictionaryProjectDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(BusinessQCManagementProjectDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessQCManagementProjectDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessQCManagementProjectDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigAssayMethodProjectDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				.selectAs(ConfigAssayMethodProjectDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigAssayMethodProjectDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'project'", BusinessAssayProjectAndParameterRespVO::getType)
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, reqVO.getBusinessQCManagementDataId())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getUsage, reqVO.getUsage())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getSymbol, reqVO.getSymbol())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getIsNotAssessment, reqVO.getIsNotAssessment())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getIsEnabled, reqVO.getIsEnabled())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessQCManagementProjectDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessQCManagementProjectDataDO::getRemark, reqVO.getRemark())
+                .orderByAsc(ConfigAssayMethodProjectDO::getSortNo));
+	}
 }