配料下发

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.java

@@ -87,9 +87,9 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
     @GetMapping("/page")
     @Operation(summary = "获得检测任务分配明细分页")
     //@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
-    public CommonResult<PageResult<BusinessAssayTaskDetailRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
+    public CommonResult<PageResult<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
-        PageResult<BusinessAssayTaskDetailDO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
+        PageResult<BusinessAssayTaskDetailExtendRespVO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class));
+        return success(pageResult);
     }
 
     @GetMapping("/list")
@@ -107,7 +107,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
     public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessAssayTaskDetailDO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
+        List<BusinessAssayTaskDetailExtendRespVO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "检测任务分配明细.xls", "数据", BusinessAssayTaskDetailRespVO.class,
                         BeanUtils.toBean(list, BusinessAssayTaskDetailRespVO.class));

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java

@@ -52,6 +52,12 @@ public class SampleAnalysisController {
 		return success("成功");
 	}
 	
+	//下发配料
+	@PostMapping("/issuedIngredients")
+	public CommonResult<?> issuedIngredients(Long businessAssayTaskId) {
+		sampleAnalysisService.issuedIngredients(businessAssayTaskId);
+		return success("成功");
+	}
 	
 	@PostMapping("/submitSampleAnalysisByTaskId")
 	public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) {
@@ -65,4 +71,10 @@ public class SampleAnalysisController {
 		return success(json);
 	}
 	
+	@PostMapping("/rollbackAnalysisSample")
+	public CommonResult<?> rollbackAnalysisSample(@RequestBody BusinessAssayTaskBackSampleReqVO req) {
+		sampleAnalysisService.rollbackAnalysisSample(req);
+		return success("成功");
+	}
+
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.zt.plat.module.qms.business.config.controller.vo.*;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -43,6 +44,13 @@ public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
     /** 动态表单值 **/
     private String formValue;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
+    @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
+    private String ingredientsStatus;
+
+
     /** 质量控制分析方法 **/
     //private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
     

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

@@ -6,6 +6,8 @@ import java.util.Map;
 
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectCoefficientRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -44,6 +46,12 @@ public class BusinessAssayTaskAnalysisSampleProjectRespVO {
     /** 动态表单值 **/
     private String formValue;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
+    @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
+    private String ingredientsStatus;
+    
     /** 分析的列 **/
     private List<BatchSampleAnalysisColumnRespVO> columns;
     

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

@@ -0,0 +1,20 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class BusinessAssayTaskBackSampleReqVO {
+	
+	/**
+	 * 任务明细id
+	 */
+	private List<Long> idList;
+	
+	/**
+	 * 退回描述
+	 */
+	private String backDesc;
+
+}

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

@@ -1,17 +1,41 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
-/**
+import io.swagger.v3.oas.annotations.media.Schema;
- * <b>BusinessAssayTaskDetailExtendRespVO</b>
+import lombok.Data;
- * <p>
+
- * 更新历史：
+@Data
- * <pre> 版本         更新时间            更新者        更新内容<hr/>
- * V1.0      2025年10月17日          wxr         Add</pre>
- * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
- * </p>
- * @author 王兴荣<wxr@wangxingrong.com>
- * @version V1.0 
- * @since 2025年10月17日
- */
 public class BusinessAssayTaskDetailExtendRespVO extends BusinessAssayTaskDetailRespVO {
 
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "样品主样ID", example = "23293")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品分样ID", example = "15024")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", example = "20464")
+    private Long businessSubSampleId;
+
+    @Schema(description = "检测方法配置ID", example = "9130")
+    private Long configAssayMethodId;
+
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
+    private String assayType;
+
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", example = "16988")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称", example = "芋艿")
+    private String assayDepartmentName;
+
+    @Schema(description = "分析人")
+    private String assayOperator;
 }

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

@@ -45,6 +45,12 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskAssignSubmitTime;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
+    @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
+    private String ingredientsStatus;
+
     @Schema(description = "分析人")
     private String assayOperator;
 
@@ -73,22 +79,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskFinishTime;
 
-    @Schema(description = "标样业务ID", example = "27168")
-    private Long standardSampleId;
-
-    @Schema(description = "标样编号")
-    private String standardSampleCode;
-
-    @Schema(description = "标准样类型ID", example = "11282")
-    private Long standardSampleTypeId;
-
-    @Schema(description = "质控样编号")
-    private String qualitySampleCode;
-
-    @Schema(description = "质控样分析时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] qualitySampleAssayTime;
-
     @Schema(description = "流程实例id", example = "19026")
     private Long flowInstanceId;
 

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

@@ -44,6 +44,12 @@ public class BusinessAssayTaskReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskAssignSubmitTime;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
+    @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
+    private String ingredientsStatus;
+
     @Schema(description = "分析人")
     private String assayOperator;
 
@@ -72,22 +78,6 @@ public class BusinessAssayTaskReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] taskFinishTime;
 
-    @Schema(description = "标样业务ID", example = "27168")
-    private Long standardSampleId;
-
-    @Schema(description = "标样编号")
-    private String standardSampleCode;
-
-    @Schema(description = "标准样类型ID", example = "11282")
-    private Long standardSampleTypeId;
-
-    @Schema(description = "质控样编号")
-    private String qualitySampleCode;
-
-    @Schema(description = "质控样分析时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] qualitySampleAssayTime;
-
     @Schema(description = "流程实例id", example = "19026")
     private Long flowInstanceId;
 

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

@@ -54,6 +54,12 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("任务单分配提交时间")
     private LocalDateTime taskAssignSubmitTime;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
+    @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
+    private String ingredientsStatus;
+
     @Schema(description = "分析人")
     @ExcelProperty("分析人")
     private String assayOperator;
@@ -82,26 +88,6 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("任务单完成时间")
     private LocalDateTime taskFinishTime;
 
-    @Schema(description = "标样业务ID", example = "27168")
-    @ExcelProperty("标样业务ID")
-    private Long standardSampleId;
-
-    @Schema(description = "标样编号")
-    @ExcelProperty("标样编号")
-    private String standardSampleCode;
-
-    @Schema(description = "标准样类型ID", example = "11282")
-    @ExcelProperty("标准样类型ID")
-    private Long standardSampleTypeId;
-
-    @Schema(description = "质控样编号")
-    @ExcelProperty("质控样编号")
-    private String qualitySampleCode;
-
-    @Schema(description = "质控样分析时间")
-    @ExcelProperty("质控样分析时间")
-    private LocalDateTime qualitySampleAssayTime;
-
     @Schema(description = "流程实例id", example = "19026")
     @ExcelProperty("流程实例id")
     private Long flowInstanceId;

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

@@ -55,6 +55,12 @@ public class BusinessAssayTaskSaveReqVO {
     @ExcelProperty("任务单分配提交时间")
     private LocalDateTime taskAssignSubmitTime;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
+    @Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
+    private String ingredientsStatus;
+
     @Schema(description = "分析人")
     private String assayOperator;
 
@@ -76,21 +82,6 @@ public class BusinessAssayTaskSaveReqVO {
     @Schema(description = "任务单完成时间")
     private LocalDateTime taskFinishTime;
 
-    @Schema(description = "标样业务ID", example = "27168")
-    private Long standardSampleId;
-
-    @Schema(description = "标样编号")
-    private String standardSampleCode;
-
-    @Schema(description = "标准样类型ID", example = "11282")
-    private Long standardSampleTypeId;
-
-    @Schema(description = "质控样编号")
-    private String qualitySampleCode;
-
-    @Schema(description = "质控样分析时间")
-    private LocalDateTime qualitySampleAssayTime;
-
     @Schema(description = "流程实例id", example = "19026")
     private Long flowInstanceId;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java

@@ -81,6 +81,16 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("TSK_ASN_SBM_TM")
     private LocalDateTime taskAssignSubmitTime;
     /**
+    * 是否配料,1-是，0-否
+    */
+    @TableField("IS_IGDT")
+    private Integer isIngredients;
+    /**
+    * 配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit
+    */
+    @TableField("IGDT_STS")
+    private String ingredientsStatus;
+    /**
     * 分析人
     */
     @TableField("ASY_OPTR")
@@ -116,31 +126,6 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("TSK_FIN_TM")
     private LocalDateTime taskFinishTime;
     /**
-    * 标样业务ID
-    */
-    @TableField("STD_SMP_ID")
-    private Long standardSampleId;
-    /**
-    * 标样编号
-    */
-    @TableField("STD_SMP_CD")
-    private String standardSampleCode;
-    /**
-    * 标准样类型ID
-    */
-    @TableField("STD_SMP_TP_ID")
-    private Long standardSampleTypeId;
-    /**
-    * 质控样编号
-    */
-    @TableField("QLT_SMP_CD")
-    private String qualitySampleCode;
-    /**
-    * 质控样分析时间
-    */
-    @TableField("QLT_SMP_ASY_TM")
-    private LocalDateTime qualitySampleAssayTime;
-    /**
     * 流程实例id
     */
     @TableField("FLW_INSC_ID")

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

@@ -4,6 +4,7 @@ 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.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
@@ -20,8 +21,21 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssayTaskDetailDO> {
 
-    default PageResult<BusinessAssayTaskDetailDO> selectPage(BusinessAssayTaskDetailPageReqVO reqVO) {
+    default PageResult<BusinessAssayTaskDetailExtendRespVO> selectPage(BusinessAssayTaskDetailPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>()
+        return selectJoinPage(reqVO, BusinessAssayTaskDetailExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDetailDO>()
+        		.leftJoin(BusinessAssayTaskDataDO.class, BusinessAssayTaskDataDO::getId, BusinessAssayTaskDetailDO::getBusinessAssayTaskDataId)
+        		.selectAll(BusinessAssayTaskDetailDO.class)
+        		.selectAs(BusinessAssayTaskDetailDO::getSampleCode, BusinessAssayTaskDetailExtendRespVO::getSampleAssayCode)
+        		.selectAs(BusinessAssayTaskDataDO::getBusinessBaseSampleId, BusinessAssayTaskDetailExtendRespVO::getBusinessBaseSampleId)
+        		.selectAs(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, BusinessAssayTaskDetailExtendRespVO::getBusinessSubParentSampleId)
+        		.selectAs(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessAssayTaskDetailExtendRespVO::getBusinessSubSampleId)
+        		.selectAs(BusinessAssayTaskDataDO::getConfigAssayMethodId, BusinessAssayTaskDetailExtendRespVO::getConfigAssayMethodId)
+        		.selectAs(BusinessAssayTaskDataDO::getTaskType, BusinessAssayTaskDetailExtendRespVO::getTaskType)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayType, BusinessAssayTaskDetailExtendRespVO::getAssayType)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayProject, BusinessAssayTaskDetailExtendRespVO::getAssayProject)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayOperator, BusinessAssayTaskDetailExtendRespVO::getAssayOperator)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayDepartmentId, BusinessAssayTaskDetailExtendRespVO::getAssayDepartmentId)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayDepartmentName, BusinessAssayTaskDetailExtendRespVO::getAssayDepartmentName)
                 .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSampleId, reqVO.getSampleId())
@@ -40,6 +54,19 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
     
     default List<BusinessAssayTaskDetailExtendRespVO> selectList(BusinessAssayTaskDetailReqVO reqVO) {
     	return selectJoinList(BusinessAssayTaskDetailExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDetailDO>()
+        		.leftJoin(BusinessAssayTaskDataDO.class, BusinessAssayTaskDataDO::getId, BusinessAssayTaskDetailDO::getBusinessAssayTaskDataId)
+        		.selectAll(BusinessAssayTaskDetailDO.class)
+        		.selectAs(BusinessAssayTaskDetailDO::getSampleCode, BusinessAssayTaskDetailExtendRespVO::getSampleAssayCode)
+        		.selectAs(BusinessAssayTaskDataDO::getBusinessBaseSampleId, BusinessAssayTaskDetailExtendRespVO::getBusinessBaseSampleId)
+        		.selectAs(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, BusinessAssayTaskDetailExtendRespVO::getBusinessSubParentSampleId)
+        		.selectAs(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessAssayTaskDetailExtendRespVO::getBusinessSubSampleId)
+        		.selectAs(BusinessAssayTaskDataDO::getConfigAssayMethodId, BusinessAssayTaskDetailExtendRespVO::getConfigAssayMethodId)
+        		.selectAs(BusinessAssayTaskDataDO::getTaskType, BusinessAssayTaskDetailExtendRespVO::getTaskType)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayType, BusinessAssayTaskDetailExtendRespVO::getAssayType)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayProject, BusinessAssayTaskDetailExtendRespVO::getAssayProject)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayOperator, BusinessAssayTaskDetailExtendRespVO::getAssayOperator)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayDepartmentId, BusinessAssayTaskDetailExtendRespVO::getAssayDepartmentId)
+        		.selectAs(BusinessAssayTaskDataDO::getAssayDepartmentName, BusinessAssayTaskDetailExtendRespVO::getAssayDepartmentName)
                 .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSampleId, reqVO.getSampleId())

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

@@ -41,6 +41,8 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .betweenIfPresent(BusinessAssayTaskDO::getTaskAssignTime, reqVO.getTaskAssignTime())
                 .eqIfPresent(BusinessAssayTaskDO::getTaskAssignStatus, reqVO.getTaskAssignStatus())
                 .betweenIfPresent(BusinessAssayTaskDO::getTaskAssignSubmitTime, reqVO.getTaskAssignSubmitTime())
+                .eqIfPresent(BusinessAssayTaskDO::getIsIngredients, reqVO.getIsIngredients())
+                .eqIfPresent(BusinessAssayTaskDO::getIngredientsStatus, reqVO.getIngredientsStatus())
                 .eqIfPresent(BusinessAssayTaskDO::getAssayOperator, reqVO.getAssayOperator())
                 .betweenIfPresent(BusinessAssayTaskDO::getAssayTime, reqVO.getAssayTime())
                 .betweenIfPresent(BusinessAssayTaskDO::getAssaySubmitTime, reqVO.getAssaySubmitTime())
@@ -49,11 +51,6 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .betweenIfPresent(BusinessAssayTaskDO::getReportTime, reqVO.getReportTime())
                 .eqIfPresent(BusinessAssayTaskDO::getReportOperator, reqVO.getReportOperator())
                 .betweenIfPresent(BusinessAssayTaskDO::getTaskFinishTime, reqVO.getTaskFinishTime())
-                .eqIfPresent(BusinessAssayTaskDO::getStandardSampleId, reqVO.getStandardSampleId())
-                .eqIfPresent(BusinessAssayTaskDO::getStandardSampleCode, reqVO.getStandardSampleCode())
-                .eqIfPresent(BusinessAssayTaskDO::getStandardSampleTypeId, reqVO.getStandardSampleTypeId())
-                .eqIfPresent(BusinessAssayTaskDO::getQualitySampleCode, reqVO.getQualitySampleCode())
-                .betweenIfPresent(BusinessAssayTaskDO::getQualitySampleAssayTime, reqVO.getQualitySampleAssayTime())
                 .eqIfPresent(BusinessAssayTaskDO::getFlowInstanceId, reqVO.getFlowInstanceId())
                 .eqIfPresent(BusinessAssayTaskDO::getFormDataCollectionId, reqVO.getFormDataCollectionId())
                 .eqIfPresent(BusinessAssayTaskDO::getFormValue, reqVO.getFormValue())
@@ -83,6 +80,8 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .betweenIfPresent(BusinessAssayTaskDO::getTaskAssignTime, reqVO.getTaskAssignTime())
                 .eqIfPresent(BusinessAssayTaskDO::getTaskAssignStatus, reqVO.getTaskAssignStatus())
                 .betweenIfPresent(BusinessAssayTaskDO::getTaskAssignSubmitTime, reqVO.getTaskAssignSubmitTime())
+                .eqIfPresent(BusinessAssayTaskDO::getIsIngredients, reqVO.getIsIngredients())
+                .eqIfPresent(BusinessAssayTaskDO::getIngredientsStatus, reqVO.getIngredientsStatus())
                 .eqIfPresent(BusinessAssayTaskDO::getAssayOperator, reqVO.getAssayOperator())
                 .betweenIfPresent(BusinessAssayTaskDO::getAssayTime, reqVO.getAssayTime())
                 .betweenIfPresent(BusinessAssayTaskDO::getAssaySubmitTime, reqVO.getAssaySubmitTime())
@@ -91,11 +90,6 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .betweenIfPresent(BusinessAssayTaskDO::getReportTime, reqVO.getReportTime())
                 .eqIfPresent(BusinessAssayTaskDO::getReportOperator, reqVO.getReportOperator())
                 .betweenIfPresent(BusinessAssayTaskDO::getTaskFinishTime, reqVO.getTaskFinishTime())
-                .eqIfPresent(BusinessAssayTaskDO::getStandardSampleId, reqVO.getStandardSampleId())
-                .eqIfPresent(BusinessAssayTaskDO::getStandardSampleCode, reqVO.getStandardSampleCode())
-                .eqIfPresent(BusinessAssayTaskDO::getStandardSampleTypeId, reqVO.getStandardSampleTypeId())
-                .eqIfPresent(BusinessAssayTaskDO::getQualitySampleCode, reqVO.getQualitySampleCode())
-                .betweenIfPresent(BusinessAssayTaskDO::getQualitySampleAssayTime, reqVO.getQualitySampleAssayTime())
                 .eqIfPresent(BusinessAssayTaskDO::getFlowInstanceId, reqVO.getFlowInstanceId())
                 .eqIfPresent(BusinessAssayTaskDO::getFormDataCollectionId, reqVO.getFormDataCollectionId())
                 .eqIfPresent(BusinessAssayTaskDO::getFormValue, reqVO.getFormValue())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDetailService.java

@@ -57,7 +57,7 @@ public interface BusinessAssayTaskDetailService {
      * @param pageReqVO 分页查询
      * @return 检测任务分配明细分页
      */
-    PageResult<BusinessAssayTaskDetailDO> getBusinessAssayTaskDetailPage(BusinessAssayTaskDetailPageReqVO pageReqVO);
+    PageResult<BusinessAssayTaskDetailExtendRespVO> getBusinessAssayTaskDetailPage(BusinessAssayTaskDetailPageReqVO pageReqVO);
 
     /**
      * 获得检测任务分配明细列表

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDetailServiceImpl.java

@@ -84,7 +84,7 @@ public class BusinessAssayTaskDetailServiceImpl implements BusinessAssayTaskDeta
     }
 
     @Override
-    public PageResult<BusinessAssayTaskDetailDO> getBusinessAssayTaskDetailPage(BusinessAssayTaskDetailPageReqVO pageReqVO) {
+    public PageResult<BusinessAssayTaskDetailExtendRespVO> getBusinessAssayTaskDetailPage(BusinessAssayTaskDetailPageReqVO pageReqVO) {
         return businessAssayTaskDetailMapper.selectPage(pageReqVO);
     }
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisService.java

@@ -37,6 +37,12 @@ public interface SampleAnalysisService {
 	 */
 	BusinessAssayTaskAnalysisSampleAndQcProjectRespVO batchSampleAndQcAnalysisByTaskId(Long businessAssayTaskId);
 	
+	/**
+	 * 下发配料
+	 * @param businessAssayTaskId
+	 */
+	void issuedIngredients(Long businessAssayTaskId);
+
 	/**
 	 * 根据任务单id提交分析数据
 	 * @param businessAssayTaskId 任务单id
@@ -56,4 +62,7 @@ public interface SampleAnalysisService {
 	 */
 	JSONObject getSampleAnalysisDataByTaskDataId(Long businessAssayTaskDataId);
 
+	void rollbackAnalysisSample(BusinessAssayTaskBackSampleReqVO req);
+
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java

@@ -26,6 +26,7 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAnd
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleAndQcProjectRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskBackSampleReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataExtendRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCManagementParameterDataReqVO;
@@ -143,6 +144,8 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		businessAssayTaskAnalysisSampleProjectRespVO.setConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
 		businessAssayTaskAnalysisSampleProjectRespVO.setDataCollectionId(businessAssayTaskDO.getFormDataCollectionId());
 		businessAssayTaskAnalysisSampleProjectRespVO.setFormValue(businessAssayTaskDO.getFormValue());
+		businessAssayTaskAnalysisSampleProjectRespVO.setIsIngredients(businessAssayTaskDO.getIsIngredients());
+		businessAssayTaskAnalysisSampleProjectRespVO.setIngredientsStatus(businessAssayTaskDO.getIngredientsStatus());
 		
 		ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId());
 		businessAssayTaskAnalysisSampleProjectRespVO.setConfigAssayMethodName(configAssayMethodDO.getName());
@@ -198,6 +201,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
             map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId());
             map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode());
             map.put("sampleName", businessAssayTaskDetailDO.getSampleName());
+            map.put("rollbackStatus", businessAssayTaskDetailDO.getRollbackStatus());
 
             BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO();
             projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
@@ -366,6 +370,8 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
 		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setDataCollectionId(businessAssayTaskDO.getFormDataCollectionId());
 		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setFormValue(businessAssayTaskDO.getFormValue());
+		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setIsIngredients(businessAssayTaskDO.getIsIngredients());
+		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setIngredientsStatus(businessAssayTaskDO.getIngredientsStatus());
 		
 		ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId());
 		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigAssayMethodName(configAssayMethodDO.getName());
@@ -453,6 +459,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
             map.put("businessAssayTaskDetailId", businessAssayTaskDetailDO.getId());
             map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode());
             map.put("sampleName", businessAssayTaskDetailDO.getSampleName());
+            map.put("rollbackStatus", businessAssayTaskDetailDO.getRollbackStatus());
 
             BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO();
             projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
@@ -904,4 +911,24 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		return resultJsonObject;
 	}
 
+	@Override
+	public void rollbackAnalysisSample(BusinessAssayTaskBackSampleReqVO req) {
+		List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByIds(req.getIdList());
+		for (BusinessAssayTaskDetailDO businessAssayTaskDetailDO : businessAssayTaskDetailList) {
+			
+			businessAssayTaskDetailDO.setRollbackStatus("confirmed_return");
+			businessAssayTaskDetailDO.setRemark(req.getBackDesc());
+		}
+		
+		businessAssayTaskDetailMapper.updateBatch(businessAssayTaskDetailList);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void issuedIngredients(Long businessAssayTaskId) {
+		BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId);
+		businessAssayTaskDO.setIngredientsStatus("in_progress");
+		businessAssayTaskMapper.updateById(businessAssayTaskDO);
+	}
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java

@@ -542,8 +542,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
 		} else {//管理样与标准样
 			//分析项目
 			List<ConfigAssayMethodProjectExtendRespVO> configAssayMethodProjectExtendRespList = configAssayMethodProjectMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
+			List<Long> configAssayMethodProjectIds = configAssayMethodProjectExtendRespList.stream().map(m -> m.getId()).collect(Collectors.toList());
 			//分析项目参数
-			List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectByConfigAssayMethodProjectId(businessAssayTaskDO.getConfigAssayMethodId());
+			List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectByConfigAssayMethodProjectIds(configAssayMethodProjectIds);
 			//分析项目
 			String assayProject = configAssayMethodProjectExtendRespList.stream().map(m -> m.getShowName()).collect(Collectors.joining(","));
 			

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodPageReqVO.java

@@ -37,6 +37,9 @@ public class ConfigAssayMethodPageReqVO extends PageParam {
     @Schema(description = "是否启用,1-启用，0-不启用")
     private Integer isEnabled;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodReqVO.java

@@ -37,6 +37,9 @@ public class ConfigAssayMethodReqVO {
     @Schema(description = "是否启用,1-启用，0-不启用")
     private Integer isEnabled;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodRespVO.java

@@ -46,6 +46,9 @@ public class ConfigAssayMethodRespVO {
     @ExcelProperty("是否启用,1-启用，0-不启用")
     private Integer isEnabled;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
     @Schema(description = "任务单模板key")
     @ExcelProperty("任务单模板key")
     private String configReportTemplateKey;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodSaveReqVO.java

@@ -38,6 +38,9 @@ public class ConfigAssayMethodSaveReqVO {
     @NotNull(message = "是否启用,1-启用，0-不启用不能为空")
     private Integer isEnabled;
 
+    @Schema(description = "是否配料,1-是，0-否")
+    private Integer isIngredients;
+
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java

@@ -37,7 +37,7 @@ public class ConfigQCSampleMethodPageReqVO extends PageParam {
     @Schema(description = "是否关联定值样,1-是，0-否")
     private Integer isCorrelation;
 
-    @Schema(description = "映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    @Schema(description = "映射检测信息配置")
     private String configInfomation;
 
     @Schema(description = "排序号")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java

@@ -48,8 +48,8 @@ public class ConfigQCSampleMethodRespVO {
     @ExcelProperty("是否关联定值样,1-是，0-否")
     private Integer isCorrelation;
 
-    @Schema(description = "映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    @Schema(description = "映射检测信息配置")
-    @ExcelProperty("映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    @ExcelProperty("映射检测信息配置")
     private String configInfomation;
 
     @Schema(description = "排序号")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java

@@ -43,7 +43,7 @@ public class ConfigQCSampleMethodSaveReqVO {
     @NotNull(message = "是否关联定值样,1-是，0-否不能为空")
     private Integer isCorrelation;
 
-    @Schema(description = "映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    @Schema(description = "映射检测信息配置")
     private String configInfomation;
 
     @Schema(description = "排序号")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSampleMethodPageReqVO.java

@@ -25,6 +25,18 @@ public class ConfigSubSampleMethodPageReqVO extends PageParam {
     @Schema(description = "任务数", example = "27414")
     private Integer taskCount;
 
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
+    @Schema(description = "判定方法,default-默认，other-其他（扩展）")
+    private String assessmentMethod;
+
+    @Schema(description = "计算方法,calculateAverageValue-平均值，来自T_CFG_RUL的编码")
+    private String calculateMethod;
+
+    @Schema(description = "映射检测信息配置")
+    private String configInfomation;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSampleMethodRespVO.java

@@ -32,6 +32,18 @@ public class ConfigSubSampleMethodRespVO {
     @ExcelProperty("任务数")
     private Integer taskCount;
 
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
+    @Schema(description = "判定方法,default-默认，other-其他（扩展）")
+    private String assessmentMethod;
+
+    @Schema(description = "计算方法,calculateAverageValue-平均值，来自T_CFG_RUL的编码")
+    private String calculateMethod;
+
+    @Schema(description = "映射检测信息配置")
+    private String configInfomation;
+
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSampleMethodSaveReqVO.java

@@ -27,6 +27,18 @@ public class ConfigSubSampleMethodSaveReqVO {
     @Schema(description = "任务数", example = "27414")
     private Integer taskCount;
 
+    @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
+    private String resultTreatmentWay;
+
+    @Schema(description = "判定方法,default-默认，other-其他（扩展）")
+    private String assessmentMethod;
+
+    @Schema(description = "计算方法,calculateAverageValue-平均值，来自T_CFG_RUL的编码")
+    private String calculateMethod;
+
+    @Schema(description = "映射检测信息配置")
+    private String configInfomation;
+
     @Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
     private String systemDepartmentCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodDO.java

@@ -72,6 +72,11 @@ public class ConfigAssayMethodDO extends BusinessBaseDO {
     @TableField("IS_ENBD")
     private Integer isEnabled;
     /**
+    * 是否配料,1-是，0-否
+    */
+    @TableField("IS_IGDT")
+    private Integer isIngredients;
+    /**
     * 任务单模板key
     */
     @TableField("CFG_RPT_TMPL_KY")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java

@@ -72,7 +72,7 @@ public class ConfigQCSampleMethodDO extends BusinessBaseDO {
     @TableField("IS_CORR")
     private Integer isCorrelation;
     /**
-    * 映射检测信息配置,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改
+    * 映射检测信息配置
     */
     @TableField("CFG_INF")
     private String configInfomation;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigSubSampleMethodDO.java

@@ -67,6 +67,11 @@ public class ConfigSubSampleMethodDO extends BusinessBaseDO {
     @TableField("CALT_MTHD")
     private String calculateMethod;
     /**
+    * 映射检测信息配置
+    */
+    @TableField("CFG_INF")
+    private String configInfomation;
+    /**
     * 所属部门
     */
     @TableField("SYS_DEPT_CD")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java

@@ -30,6 +30,7 @@ public interface ConfigAssayMethodMapper extends BaseMapperX<ConfigAssayMethodDO
                 .eqIfPresent(ConfigAssayMethodDO::getMethodCode, reqVO.getMethodCode())
                 .eqIfPresent(ConfigAssayMethodDO::getDescription, reqVO.getDescription())
                 .eqIfPresent(ConfigAssayMethodDO::getIsEnabled, reqVO.getIsEnabled())
+                .eqIfPresent(ConfigAssayMethodDO::getIsIngredients, reqVO.getIsIngredients())
                 .eqIfPresent(ConfigAssayMethodDO::getConfigReportTemplateKey, reqVO.getConfigReportTemplateKey())
                 .eqIfPresent(ConfigAssayMethodDO::getCodeRule, reqVO.getCodeRule())
                 .eqIfPresent(ConfigAssayMethodDO::getAssignWay, reqVO.getAssignWay())
@@ -54,6 +55,7 @@ public interface ConfigAssayMethodMapper extends BaseMapperX<ConfigAssayMethodDO
                 .eqIfPresent(ConfigAssayMethodDO::getDescription, reqVO.getDescription())
                 .eqIfPresent(ConfigAssayMethodDO::getDataCollectionKey, reqVO.getDataCollectionKey())
                 .eqIfPresent(ConfigAssayMethodDO::getIsEnabled, reqVO.getIsEnabled())
+                .eqIfPresent(ConfigAssayMethodDO::getIsIngredients, reqVO.getIsIngredients())
                 .eqIfPresent(ConfigAssayMethodDO::getConfigReportTemplateKey, reqVO.getConfigReportTemplateKey())
                 .eqIfPresent(ConfigAssayMethodDO::getCodeRule, reqVO.getCodeRule())
                 .eqIfPresent(ConfigAssayMethodDO::getAssignWay, reqVO.getAssignWay())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectParameterMapper.java

@@ -44,7 +44,7 @@ public interface ConfigAssayMethodProjectParameterMapper extends BaseMapperX<Con
     			.eq(ConfigAssayMethodProjectParameterDO::getConfigAssayMethodProjectId, configAssayMethodProjectId));
     }
     
-    default List<ConfigAssayMethodProjectParameterDO> selectByConfigAssayMethodProjectIds(Long configAssayMethodProjectIds) {
+    default List<ConfigAssayMethodProjectParameterDO> selectByConfigAssayMethodProjectIds(List<Long> configAssayMethodProjectIds) {
     	return selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectParameterDO>()
     			.in(ConfigAssayMethodProjectParameterDO::getConfigAssayMethodProjectId, configAssayMethodProjectIds));
     }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSubSampleMethodMapper.java

@@ -28,6 +28,10 @@ public interface ConfigSubSampleMethodMapper extends BaseMapperX<ConfigSubSample
                 .eqIfPresent(ConfigSubSampleMethodDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
                 .eqIfPresent(ConfigSubSampleMethodDO::getIsDefaultUse, reqVO.getIsDefaultUse())
                 .eqIfPresent(ConfigSubSampleMethodDO::getTaskCount, reqVO.getTaskCount())
+                .eqIfPresent(ConfigSubSampleMethodDO::getResultTreatmentWay, reqVO.getResultTreatmentWay())
+                .eqIfPresent(ConfigSubSampleMethodDO::getAssessmentMethod, reqVO.getAssessmentMethod())
+                .eqIfPresent(ConfigSubSampleMethodDO::getCalculateMethod, reqVO.getCalculateMethod())
+                .eqIfPresent(ConfigSubSampleMethodDO::getConfigInfomation, reqVO.getConfigInfomation())
                 .eqIfPresent(ConfigSubSampleMethodDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(ConfigSubSampleMethodDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ConfigSubSampleMethodDO::getRemark, reqVO.getRemark())