任务数量为空，删除bug

qms-server/src/main/resources/application.yml

@@ -119,5 +119,9 @@ zt:
     version: ${zt.info.version}
   tenant: # 多租户相关配置项
     enable: true
-
+    ignore-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
+  security:
+    permit-all-urls:
+      - /admin-api/qms/system-version-management/get-by-platform/**
 debug: false

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -37,6 +37,7 @@ public interface ErrorCodeConstants {
 	/*==============================config 配置模块 1_032_050_000 ~ 1_032_099_999 ===============================*/
 	ErrorCode CONFIG_REPORT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表模版配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法配置不存在");
+	ErrorCode CONFIG_ASSAY_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法参数配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_RANGE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目区间不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目判定不存在");
@@ -47,13 +48,14 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_SUB_SAMPLE_PARENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样配置不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_PARENT_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与检测方法配置不存在");
 	//ErrorCode CONFIG_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与复检配置不存在");
-	ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与检测方法配置不存在");
+	ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与分样检测方法配置表不存在");
 	ErrorCode CONFIG_SUB_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样配置不存在");
 	ErrorCode CONFIG_SAMPLE_REPORT_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品报表关系不存在");
 	ErrorCode CONFIG_SAMPLE_FLOW_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品流程配置不存在");
 	ErrorCode CONFIG_REPORT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表类型配置不存在");
 	ErrorCode CONFIG_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目配置不存在");
 	ErrorCode CONFIG_ENTRUST_SOURCE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源配置不存在");
+	ErrorCode CONFIG_ENTRUST_SOURCE_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源与样品类型配置不存在");
 
 	ErrorCode CONFIG_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "主样配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目参数配置不存在");
@@ -100,6 +102,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_HANDOVER_RECORD_SUB_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样交接记录业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ASSAY_RESULT_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记来样品位不存在");
 	ErrorCode BUSINESS_ASSAY_TASK_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样检测任务业务不存在");
+	ErrorCode BUSINESS_ASSAY_TASK_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样检测任务参数业务不存在");
 	ErrorCode BUSINESS_ASSAY_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测项目数据业务不存在");
 	ErrorCode BUSINESS_ASSAY_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测参数数据业务不存在");
 	ErrorCode BUSINESS_SUB_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "子样判定业务不存在");
@@ -128,6 +131,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_QC_MANAGEMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务数据,管理样、标准样不存在");
 	ErrorCode BUSINESS_QC_MANAGEMENT_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
 	ErrorCode BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
+	ErrorCode BUSINESS_QC_MANAGEMENT_SAMPLE_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数不存在");
 	ErrorCode BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数任务数据,空白样、标样不存在");
 	ErrorCode BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数参数业务不存在");
 	
@@ -139,19 +143,56 @@ public interface ErrorCodeConstants {
 	ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
 	ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告类型配置不存在");
 	ErrorCode REPORT_DOCUMENT_MAIN_CORRELATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告主数据关系不存在");
+	ErrorCode REPORT_DOCUMENT_FILE_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告附件不存在");
 
 	ErrorCode BUSINESS_SAMPLE_DISPATCH_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨不存在");
 	ErrorCode BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨明细不存在");
 
 	/*=================================resource  资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
-	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");
+//	----------设备管理----------
-	ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备大类不存在");
+	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备信息不存在");
+	ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备大类不存在");
+	ErrorCode DEVICE_MAINTAIN_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护数据不存在");
+	ErrorCode DEVICE_MAINTAIN_ITEM_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护项不存在");
+	ErrorCode DEVICE_CONFIG_BUSINESS_RULE_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备业务配置不存在");
+	ErrorCode DEVICE_CONFIG_BUSINESS_ITEM_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备业务配置项不存在");
+	ErrorCode DEVICE_PERIOD_CHECK_NOT_EXISTS = new ErrorCode(1_032_150_000, "期间核查数据不存在");
+
+	ErrorCode DEVICE_PERIOD_CHECK_PLAN_NOT_EXISTS = new ErrorCode(1_032_150_000, "期间核查计划不存在");
+	ErrorCode DEVICE_REPAIR_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修申请数据不存在");
+	ErrorCode DEVICE_REPAIR_RESULT_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修结果明细不存在");
+	ErrorCode DEVICE_REPAIR_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维修明细不存在");
+	ErrorCode DEVICE_CALIBRATION_PLAN_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准计划不存在");
+	ErrorCode DEVICE_CALIBRATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "检定校准数据不存在");
+	ErrorCode DEVICE_USE_RECORD_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备使用记录不存在");
+	ErrorCode DEVICE_AFFILIATION_RELATIVITY_NOT_EXISTS = new ErrorCode(1_032_150_000, "附属设备关系不存在");
+	ErrorCode DEVICE_APPLY_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请明细数据不存在");
+	ErrorCode DEVICE_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请数据不存在");
+
+
+//	-------------物料试剂-------------
 	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材不存在");
 	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
-
 	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
 	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程不存在");
 
+	ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次不存在");
+	ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次分发不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库，出库不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库明细,出库明细等不存在");
+
+	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_150_000, "客户端版本管理不存在");
+
+	ErrorCode MATERIAL_LOCATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "存放位置不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点项不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点明细不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "出库不存在");
+	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
+
+
+
+
 
 	/*================================= tx 1_032_200_000 ~ 1_032_249_999 ==================================*/
 
@@ -159,6 +200,11 @@ public interface ErrorCodeConstants {
 
 
 	/*================================= office 办公 1_032_250_000 ~ 1_032_299_999 ==================================*/
+	ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商不存在");
+	ErrorCode SUPPLIER_PROPERTIES_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商属性不存在");
+	ErrorCode SUPPLIER_EVALUATION_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商评价不存在");
+	ErrorCode SUPPLIER_EVALUATION_AT_NOT_EXISTS = new ErrorCode(1_032_250_000, "供应商评价关系不存在");
+
 
 
 	/*================================= dzj 大质检 1_032_300_000 ~ 1_032_349_999 ==================================*/

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java

@@ -14,6 +14,9 @@ public class QmsBpmConstant {
     public static final String BPM_FIELD_EXTENSIONS = "bpmFieldExtensions";
     public static final String BPM_FIRST_ACTIVITY_FLAG = "firstActivityFlag";
     public static final String BPM_LAST_ACTIVITY_FLAG = "lastActivityFlag";
+    public static final String BPM_REJECT_TO_FIRST_FLAG = "rejectToFirstActivity";
+    public static final String BPM_CUR_ACTIVITY_INS_ID = "currentActivityInsId";        //当前活动实例id
+    public static final String BPM_PROCESS_INS_ID = "processInstanceId";        //当前活动实例id
 
     //驳回标记前缀
     public static final String BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY = "RETURN_FLAG_";

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

@@ -107,6 +107,15 @@ public interface QmsCommonConstant {
     /** 检验委托 **/
     String ENTRUST_INSPECTION = "entrust_inspection";
     
+    /** 委托样品类型： 委检样 **/
+    String ENTRUST_COMMISSION_INSPECTION_SAMPLE = "commissionInspectionSample";
+
+    /** 委托样品类型： 商检分析样 **/
+    String ENTRUST_INSPECTION_ANALYSIS_SAMPLE = "inspectionAnalysisSample";
+
+    /** 委托样品类型： 商检综合 **/
+    String ENTRUST_COMPREHENSIVE_INSPECTION_SAMPLE = "comprehensiveInspectionSample";
+    
     /** 中心收样 **/
     String FLOW_NODE_CENTER_RECEIVE = "flw_center_receive";
     
@@ -179,6 +188,10 @@ public interface QmsCommonConstant {
     /** 检验完成状态-未完成 **/
     String UNCHECKED = "unchecked";
     
+    /** 数据回报状态 未回报 **/
+    String UNRETURNED = "unreturned";
+    
+    
     /** 自动 **/
     String AUTOMATIC = "automatic";
     
@@ -194,4 +207,7 @@ public interface QmsCommonConstant {
 
     /** 允许提交 **/
     String ALLOW_SUBMIT = "allow_submit";
+    
+    
+    
 }

zt-module-qms/zt-module-qms-server/pom.xml

@@ -17,7 +17,8 @@
         QMS模块。
     </description>
     <properties>
-        <zzjc.tio.version>3.9.1.v20251013-RELEASE</zzjc.tio.version>
+        <zzjc.tio.version>3.9.1.v20251204-RELEASE</zzjc.tio.version>
+        <liteflow.version>2.15.2</liteflow.version>
     </properties>
     <dependencies>
         <!-- Spring Cloud 基础 -->
@@ -141,27 +142,27 @@
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-spring-boot-starter</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-javax-pro</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-groovy</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-qlexpress</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>liteflow-script-graaljs</artifactId>
-            <version>2.15.1</version>
+            <version>${liteflow.version}</version>
         </dependency>
 
         <!-- pdfbox -->

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

@@ -0,0 +1,106 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskParameterDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskParameterDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 子样检测任务参数业务")
+@RestController
+@RequestMapping("/qms/business-assay-task-parameter-data")
+@Validated
+public class BusinessAssayTaskParameterDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessAssayTaskParameterDataService businessAssayTaskParameterDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建子样检测任务参数业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:create')")
+    public CommonResult<BusinessAssayTaskParameterDataRespVO> createBusinessAssayTaskParameterData(@Valid @RequestBody BusinessAssayTaskParameterDataSaveReqVO createReqVO) {
+        return success(businessAssayTaskParameterDataService.createBusinessAssayTaskParameterData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新子样检测任务参数业务")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:update')")
+    public CommonResult<Boolean> updateBusinessAssayTaskParameterData(@Valid @RequestBody BusinessAssayTaskParameterDataSaveReqVO updateReqVO) {
+        businessAssayTaskParameterDataService.updateBusinessAssayTaskParameterData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除子样检测任务参数业务")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTaskParameterData(@RequestParam("id") Long id) {
+        businessAssayTaskParameterDataService.deleteBusinessAssayTaskParameterData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除子样检测任务参数业务")
+                @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessAssayTaskParameterDataList(@RequestBody BatchDeleteReqVO req) {
+        businessAssayTaskParameterDataService.deleteBusinessAssayTaskParameterDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得子样检测任务参数业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:query')")
+    public CommonResult<BusinessAssayTaskParameterDataRespVO> getBusinessAssayTaskParameterData(@RequestParam("id") Long id) {
+        BusinessAssayTaskParameterDataDO businessAssayTaskParameterData = businessAssayTaskParameterDataService.getBusinessAssayTaskParameterData(id);
+        return success(BeanUtils.toBean(businessAssayTaskParameterData, BusinessAssayTaskParameterDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得子样检测任务参数业务分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:query')")
+    public CommonResult<PageResult<BusinessAssayTaskParameterDataRespVO>> getBusinessAssayTaskParameterDataPage(@Valid BusinessAssayTaskParameterDataPageReqVO pageReqVO) {
+        PageResult<BusinessAssayTaskParameterDataDO> pageResult = businessAssayTaskParameterDataService.getBusinessAssayTaskParameterDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessAssayTaskParameterDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出子样检测任务参数业务 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-parameter-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessAssayTaskParameterDataExcel(@Valid BusinessAssayTaskParameterDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessAssayTaskParameterDataDO> list = businessAssayTaskParameterDataService.getBusinessAssayTaskParameterDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "子样检测任务参数业务.xls", "数据", BusinessAssayTaskParameterDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessAssayTaskParameterDataRespVO.class));
+    }
+
+}

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

@@ -84,18 +84,18 @@ public class BusinessQCCoefficientDataController implements BusinessControllerMa
 
     @GetMapping("/page")
     @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
-    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
+//    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
-    public CommonResult<PageResult<BusinessQCCoefficientDataRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO) {
+    public CommonResult<PageResult<BusinessQCCoefficientDataExtendRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO) {
-        PageResult<BusinessQCCoefficientDataDO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO);
+        PageResult<BusinessQCCoefficientDataExtendRespVO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class));
+        return success(pageResult);
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
 //    @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
-    public CommonResult<List<BusinessQCCoefficientDataRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataReqVO reqVO) {
+    public CommonResult<List<BusinessQCCoefficientDataExtendRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataReqVO reqVO) {
-        List<BusinessQCCoefficientDataDO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataList(reqVO);
+        List<BusinessQCCoefficientDataExtendRespVO> listResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataList(reqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class));
+        return success(listResult);
     }
 
     @GetMapping("/export-excel")
@@ -105,7 +105,7 @@ public class BusinessQCCoefficientDataController implements BusinessControllerMa
     public void exportBusinessQCCoefficientDataExcel(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessQCCoefficientDataDO> list = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO).getList();
+        List<BusinessQCCoefficientDataExtendRespVO> list = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "质控样检测系数任务数据,空白样、标样.xls", "数据", BusinessQCCoefficientDataRespVO.class,
                         BeanUtils.toBean(list, BusinessQCCoefficientDataRespVO.class));

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

@@ -85,17 +85,17 @@ public class BusinessQCManagementDataController implements BusinessControllerMar
     @GetMapping("/page")
     @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样分页")
     @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
-    public CommonResult<PageResult<BusinessQCManagementDataRespVO>> getBusinessQCManagementDataPage(@Valid BusinessQCManagementDataPageReqVO pageReqVO) {
+    public CommonResult<PageResult<BusinessQCManagementDataExtendRespVO>> getBusinessQCManagementDataPage(@Valid BusinessQCManagementDataPageReqVO pageReqVO) {
-        PageResult<BusinessQCManagementDataDO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO);
+        PageResult<BusinessQCManagementDataExtendRespVO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class));
+        return success(pageResult);
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样列表")
 //    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
-    public CommonResult<List<BusinessQCManagementDataRespVO>> getBusinessQCManagementDataList(@Valid BusinessQCManagementDataReqVO reqVO) {
+    public CommonResult<List<BusinessQCManagementDataExtendRespVO>> getBusinessQCManagementDataList(@Valid BusinessQCManagementDataReqVO reqVO) {
-    	List<BusinessQCManagementDataDO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataList(reqVO);
+    	List<BusinessQCManagementDataExtendRespVO> listResult = businessQCManagementDataService.getBusinessQCManagementDataList(reqVO);
-        return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class));
+        return success(listResult);
     }
 
     @GetMapping("/export-excel")
@@ -105,7 +105,7 @@ public class BusinessQCManagementDataController implements BusinessControllerMar
     public void exportBusinessQCManagementDataExcel(@Valid BusinessQCManagementDataPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<BusinessQCManagementDataDO> list = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO).getList();
+        List<BusinessQCManagementDataExtendRespVO> list = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "质控管理样检测任务数据,管理样、标准样.xls", "数据", BusinessQCManagementDataRespVO.class,
                         BeanUtils.toBean(list, BusinessQCManagementDataRespVO.class));

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

@@ -0,0 +1,106 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementSampleParameterDataDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementSampleParameterDataService;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+@Tag(name = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+@RestController
+@RequestMapping("/qms/business-QC-management-sample-parameter-data")
+@Validated
+public class BusinessQCManagementSampleParameterDataController implements BusinessControllerMarker {
+
+
+    @Resource
+    private BusinessQCManagementSampleParameterDataService businessQCManagementSampleParameterDataService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:create')")
+    public CommonResult<BusinessQCManagementSampleParameterDataRespVO> createBusinessQCManagementSampleParameterData(@Valid @RequestBody BusinessQCManagementSampleParameterDataSaveReqVO createReqVO) {
+        return success(businessQCManagementSampleParameterDataService.createBusinessQCManagementSampleParameterData(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:update')")
+    public CommonResult<Boolean> updateBusinessQCManagementSampleParameterData(@Valid @RequestBody BusinessQCManagementSampleParameterDataSaveReqVO updateReqVO) {
+        businessQCManagementSampleParameterDataService.updateBusinessQCManagementSampleParameterData(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementSampleParameterData(@RequestParam("id") Long id) {
+        businessQCManagementSampleParameterDataService.deleteBusinessQCManagementSampleParameterData(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+                @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:delete')")
+    public CommonResult<Boolean> deleteBusinessQCManagementSampleParameterDataList(@RequestBody BatchDeleteReqVO req) {
+        businessQCManagementSampleParameterDataService.deleteBusinessQCManagementSampleParameterDataListByIds(req.getIds());
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:query')")
+    public CommonResult<BusinessQCManagementSampleParameterDataRespVO> getBusinessQCManagementSampleParameterData(@RequestParam("id") Long id) {
+        BusinessQCManagementSampleParameterDataDO businessQCManagementSampleParameterData = businessQCManagementSampleParameterDataService.getBusinessQCManagementSampleParameterData(id);
+        return success(BeanUtils.toBean(businessQCManagementSampleParameterData, BusinessQCManagementSampleParameterDataRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:query')")
+    public CommonResult<PageResult<BusinessQCManagementSampleParameterDataRespVO>> getBusinessQCManagementSampleParameterDataPage(@Valid BusinessQCManagementSampleParameterDataPageReqVO pageReqVO) {
+        PageResult<BusinessQCManagementSampleParameterDataDO> pageResult = businessQCManagementSampleParameterDataService.getBusinessQCManagementSampleParameterDataPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BusinessQCManagementSampleParameterDataRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数 Excel")
+    @PreAuthorize("@ss.hasPermission('qms:business-QC-management-sample-parameter-data:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBusinessQCManagementSampleParameterDataExcel(@Valid BusinessQCManagementSampleParameterDataPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<BusinessQCManagementSampleParameterDataDO> list = businessQCManagementSampleParameterDataService.getBusinessQCManagementSampleParameterDataPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数.xls", "数据", BusinessQCManagementSampleParameterDataRespVO.class,
+                        BeanUtils.toBean(list, BusinessQCManagementSampleParameterDataRespVO.class));
+    }
+
+}

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

@@ -110,6 +110,9 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
     @GetMapping("/queryWaitingDataForReport")
     @Operation(summary = "查询待编制数据")
     public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> queryWaitingDataForReport(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
+        Long configReportTypeId = pageReqVO.getConfigReportTypeId();
+        if(configReportTypeId == null)
+            return CommonResult.error(0, "缺少configReportTypeId参数，请刷新后重试！");
         PageResult<BusinessSampleEntrustRegistrationExtendRespVO> result = businessSampleEntrustRegistrationService.queryWaitingDataForReport(pageReqVO);
         return success(result);
     }

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

@@ -31,12 +31,6 @@ public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	@Resource
 	private SampleAnalysisAuditService sampleAnalysisAuditService;
 	
-	@GetMapping("/crossAuditByTaskId")
-	public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
-		JSONObject result = sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId);
-		return success(result);
-	}
-
 	/**
 	 * 交叉审核
 	 * @return
@@ -48,8 +42,8 @@ public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	}
 	
 	@GetMapping("/getSampleResultAssessmentList")
-	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) {
+	public CommonResult<JSONObject> getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
-		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, asmtReportedStatus);
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(reqVO);
 		return success(result);
 	}
 	

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

@@ -29,12 +29,14 @@ public class SampleAnalysisController implements BusinessControllerMarker {
 	@Resource
 	private SampleAnalysisService sampleAnalysisService ;
 	
+	@Deprecated
 	@GetMapping("/batchSampleAnalysisByTaskId")
 	public CommonResult<?> batchSampleAnalysisByTaskId(Long businessAssayTaskId) {
 		BusinessAssayTaskAnalysisSampleProjectRespVO businessAssayTaskAnalysisSampleProject = sampleAnalysisService.batchSampleAnalysisByTaskId(businessAssayTaskId);
 		return success(businessAssayTaskAnalysisSampleProject);
 	}
-	
+
+	@Deprecated
 	@PostMapping("/saveBatchSampleAnalysis")
 	public CommonResult<?> saveBatchSampleAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleProjectRespVO vo) {
 		sampleAnalysisService.saveBatchSampleAnalysis(vo);

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

@@ -59,14 +59,6 @@ public class SampleEntrustController implements BusinessControllerMarker {
     	BusinessSampleEntrustRegistrationExtendRespVO sampleEntrustRegistration = sampleEntrustService.detail(id);
     	return success(sampleEntrustRegistration);
     }
-
-    @GetMapping("/reportDetail")
-    @Operation(summary = "委托单详情数据")
-    public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
-    	JSONObject jsonObject = sampleEntrustService.reportDetail(id);
-    	return success(jsonObject);
-    	
-    }
     
     @PostMapping("/update")
     @Operation(summary = "修改委托登记")

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

@@ -1,33 +1,24 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson2.JSON;
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
-import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowInfo;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowParam;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleFlowContext;
 import com.zt.plat.module.qms.business.bus.service.SampleFlowService;
-import com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
-import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode;
+
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
-import static com.zt.plat.framework.common.pojo.CommonResult.error;
 
 @Tag(name = "管理后台 - 样品流转")
 @RestController
@@ -45,138 +36,22 @@ public class SampleFlowController implements BusinessControllerMarker {
     public CommonResult<?> sampleFlow(@Validated @RequestBody SampleFlowParam sampleFlowParam) {
     	LiteflowResponse response = sampleFlowService.sampleFlow(sampleFlowParam);
     	return success(response.getContextBean(SampleFlowContext.class));
-    }    
+    }
-
-    @GetMapping("/test")
-    public CommonResult<?> test() {
-    	
-    	SampleFlowDefinition sampleFlowDefinition = new SampleFlowDefinition();
-    	sampleFlowDefinition.setFlowKey("flw_sub_sample_process");
-    	sampleFlowDefinition.setFlowName("子样样品流转流程");
-    	List<SampleFlowNode> flowNodeList = new ArrayList<>();
-    	
-    	SampleFlowNode zxr = new SampleFlowNode();
-    	zxr.setNodeName("中心收样");
-    	zxr.setNodeKey("flw_center_receive");
-    	zxr.setSort(3100);
-
-    	SampleFlowNode zxs = new SampleFlowNode();
-    	zxs.setNodeName("中心送样");
-    	zxs.setNodeKey("flw_center_send");
-    	zxs.setSort(3200);
-
-    	SampleFlowNode bzr = new SampleFlowNode();
-    	bzr.setNodeName("班组收样");
-    	bzr.setNodeKey("flw_team_receive");
-    	bzr.setSort(3300);
-
-    	SampleFlowNode ypbm = new SampleFlowNode();
-    	ypbm.setNodeName("样品编密");
-    	ypbm.setNodeKey("flw_sample_encrypt");
-    	ypbm.setSort(3400);
-
-//    	SampleFlowNode fxr = new SampleFlowNode();
-//    	fxr.setNodeName("分析收样");
-//    	fxr.setNodeKey("flw_analysis_receive");
-//    	fxr.setSort(3500);
-//
-    	SampleFlowNode fx = new SampleFlowNode();
-    	fx.setNodeName("样品分析");
-    	fx.setNodeKey("flw_analysis");
-    	fx.setSort(3550);
-//
-//    	SampleFlowNode fxs = new SampleFlowNode();
-//    	fxs.setNodeName("分析送样");
-//    	fxs.setNodeKey("flw_analysis_send");
-//    	fxs.setSort(3600);
-
-    	SampleFlowNode bzs = new SampleFlowNode();
-    	bzs.setNodeName("班组送样");
-    	bzs.setNodeKey("flw_team_send");
-    	bzs.setSort(3700);
-
-    	SampleFlowNode ypgk = new SampleFlowNode();
-    	ypgk.setNodeName("样品归库");
-    	ypgk.setNodeKey("flw_sample_storage");
-    	ypgk.setSort(3800);
-    	ypgk.setNextFlowNodeList(null);
-    	flowNodeList.add(ypgk);
-    	
-
-    	zxr.setNextFlowNodeList(new ArrayList<SampleFlowNode>() {
-    		{
-    			add(BeanUtils.toBean(zxs,SampleFlowNode.class).setIsDefault(true));
-    		}
-    	});
-    	flowNodeList.add(zxr);
-    	
-
-    	zxs.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setIsDefault(true));
-    	}});
-    	flowNodeList.add(zxs);
-
-    	bzr.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
-    	}});
-    	flowNodeList.add(bzr);
-    	
-
-    	ypbm.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
-    	}});
-    	flowNodeList.add(ypbm);
-    	
-
-//    	fxr.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
-//    	}});
-//    	flowNodeList.add(fxr);
-//    	
-//
-//    	fxs.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
-//    	}});
-//    	flowNodeList.add(fxs);
-    	
-    	fx.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
-    	}});
-    	flowNodeList.add(fx);
-
-    	bzs.setNextFlowNodeList(new ArrayList<>() {{
-//    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("subSampleSelfReportedOthersPending"));//当前部门数据已全部判断上报
-    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("subSampleAlldeptAnalyzed"));//当前样品所有分析任务已全部上报完
-    	}});
-    	flowNodeList.add(bzs);
-    	
-    	sampleFlowDefinition.setFlowNodeList(flowNodeList);
-    	
-    	String jsonSampleFlowDefinition = JSON.toJSONString(sampleFlowDefinition);
-    	
-    	System.out.println(jsonSampleFlowDefinition);
-    	
-    	Long tenantId = TenantContextHolder.getRequiredTenantId();
-    	
-    	List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>();
-    	sampleFlowInfoList.add(new SampleFlowInfo().setId(1967550576457330690L).setIsWeighing(0));
-    	
-    	SampleFlowParam sampleFlowParam = new SampleFlowParam();
-    	sampleFlowParam.setSampleSourceType(2);
-    	sampleFlowParam.setCurrentSampleFlowKey("P3000");
-    	sampleFlowParam.setSampleFlowInfoList(sampleFlowInfoList);
-    	
-    	
-    	
-    	LiteflowResponse response = flowExecutor.execute2Resp("sampleFlowChain" + tenantId, sampleFlowParam, SampleFlowContext.class);
-    	if (response.isSuccess()) {
-			return success(response.getContextBean(SampleFlowContext.class));
-		} else {
-			return error(1_032_100_000, response.getMessage());
-		}
-    	//return success(FlowBus.getNodeMap());
-	}
 
+    /**
+     * 中心收样并送样
+     * @param sampleFlowParam
+     * @return
+     */
+    @PostMapping("/centerReceiveAndSend")
+    public CommonResult<?> centerReceiveAndSend(@Validated @RequestBody SampleFlowParam sampleFlowParam) {
+    	//中心收样
+    	sampleFlowParam.setCurrentSampleFlowKey(QmsCommonConstant.FLOW_NODE_CENTER_RECEIVE);
+    	LiteflowResponse response = sampleFlowService.sampleFlow(sampleFlowParam);
+    	//中心送样
+    	sampleFlowParam.setCurrentSampleFlowKey(QmsCommonConstant.FLOW_NODE_CENTER_SEND);
+    	sampleFlowParam.setSendSampleOper(null);
+    	response = sampleFlowService.sampleFlow(sampleFlowParam);
+    	return success(response.getContextBean(SampleFlowContext.class));
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
+import com.zt.plat.module.qms.business.bus.service.SampleEntrustService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.Resource;
+
+/**
+ * 报表数据查询接口，不继承BusinessControllerMarker
+ */
+@RestController
+@RequestMapping("/qms/bus/sample/reporting-data-query")
+public class SampleReportDataQueryController {
+    
+    @Resource
+    private SampleEntrustService sampleEntrustService;
+    
+	@Resource
+	private SampleAnalysisAuditService sampleAnalysisAuditService;
+
+    @GetMapping("/entrust-report-detail")
+    @Operation(summary = "委托单详情数据")
+    public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
+    	JSONObject jsonObject = sampleEntrustService.reportDetail(id);
+    	return success(jsonObject);
+    	
+    }
+
+    @Operation(summary = "委托单详情数据")
+	@GetMapping("/crossAuditByTaskId")
+	public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
+		JSONObject result = sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId);
+		return success(result);
+	}
+}

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

@@ -43,8 +43,8 @@ public class SampleResultReportingController implements BusinessControllerMarker
 	
 	//获取方法对应的样品
 	@GetMapping("/getSampleResultReportingList")
-	public CommonResult<?> getSampleResultReportingList(Long configAssayMethodId) {
+	public CommonResult<?> getSampleResultReportingList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
-		JSONObject result = sampleResultReportingService.getSampleResultReportingList(configAssayMethodId);
+		JSONObject result = sampleResultReportingService.getSampleResultReportingList(reqVO);
 		return success(result);
 	}
 	

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
@@ -20,6 +21,8 @@ import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethod
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam;
 import com.zt.plat.module.qms.business.bus.service.SampleTaskAssignService;
 import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
+
+import cn.hutool.core.collection.CollUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -39,6 +42,13 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
 		List<AdminUserRespDTO> list = sampleTaskAssignService.getAssignUserList();
 		return success(list);
 	}
+
+	@Operation(description = "根据用户id获取用户信息")
+	@GetMapping("/getUserInfoById")
+	public CommonResult<?> getUserInfoById(Long userId) {
+		AdminUserRespDTO userRespDTO = sampleTaskAssignService.getUserInfoById(userId);
+		return success(userRespDTO);
+	}
 	
 	@GetMapping("/getAssaySampleList")
 	public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
@@ -46,9 +56,17 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
 		return success(list);
 	} 
 	
-	@GetMapping("/getAssayMethodList")
+	@GetMapping("/getAssayMethodProjectList")
-	public CommonResult<?> getAssayMethodList(Long businessSubSampleId, Long configAssayMethodId) {
+	public CommonResult<?> getAssayMethodProjectList(String businessSubSampleIds, Long configAssayMethodId) {
-		List<Object> list = sampleTaskAssignService.getAssayMethodList(businessSubSampleId, configAssayMethodId);
+		List<Long> businessSubSampleIdList = Arrays.asList(businessSubSampleIds.split(",")).stream().map(Long::parseLong).toList();
+		List<AssayMethodProjectRespVO> list = sampleTaskAssignService.getAssayMethodProjectList(businessSubSampleIdList, configAssayMethodId);
+		return success(list);
+	}
+	
+	@GetMapping("/getMaterialAssayStandardMethodProjectList")
+	public CommonResult<?> getMaterialAssayStandardMethodProjectList(String businessSubSampleIds, Long baseSampleId, Long configAssayMethodId) {
+		List<Long> businessSubSampleIdList = Arrays.asList(businessSubSampleIds.split(",")).stream().map(Long::parseLong).toList();
+		List<AssayMethodProjectRespVO> list = sampleTaskAssignService.getMaterialAssayStandardMethodProjectList(businessSubSampleIdList, baseSampleId, configAssayMethodId);
 		return success(list);
 	}
 
@@ -100,6 +118,11 @@ public class SampleTaskAssignController implements BusinessControllerMarker {
     	return success("成功");
     }
     
+    /**
+     * 作废
+     * @param id
+     * @return
+     */
     @PostMapping("/voidAssign")
     public CommonResult<?> voidAssign(Long id) {
     	sampleTaskAssignService.voidAssign(id);

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

@@ -0,0 +1,155 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson2.JSON;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.qms.core.sampleflow.SampleFlowDefinition;
+import com.zt.plat.module.qms.core.sampleflow.SampleFlowNode;
+
+
+@RestController
+@RequestMapping("/qms/bus/test")
+public class TestController {
+
+
+    @GetMapping("/testSampleFlow")
+    public CommonResult<?> testSampleFlow() {
+    	
+    	SampleFlowDefinition sampleFlowDefinition = new SampleFlowDefinition();
+    	sampleFlowDefinition.setFlowKey("flw_sub_sample_process");
+    	sampleFlowDefinition.setFlowName("子样样品流转流程");
+    	List<SampleFlowNode> flowNodeList = new ArrayList<>();
+    	
+    	SampleFlowNode zxr = new SampleFlowNode();
+    	zxr.setNodeName("中心收样");
+    	zxr.setNodeKey("flw_center_receive");
+    	zxr.setSort(3100);
+
+    	SampleFlowNode zxs = new SampleFlowNode();
+    	zxs.setNodeName("中心送样");
+    	zxs.setNodeKey("flw_center_send");
+    	zxs.setSort(3200);
+
+    	SampleFlowNode bzr = new SampleFlowNode();
+    	bzr.setNodeName("班组收样");
+    	bzr.setNodeKey("flw_team_receive");
+    	bzr.setSort(3300);
+
+    	SampleFlowNode ypbm = new SampleFlowNode();
+    	ypbm.setNodeName("样品编密");
+    	ypbm.setNodeKey("flw_sample_encrypt");
+    	ypbm.setSort(3400);
+
+//    	SampleFlowNode fxr = new SampleFlowNode();
+//    	fxr.setNodeName("分析收样");
+//    	fxr.setNodeKey("flw_analysis_receive");
+//    	fxr.setSort(3500);
+//
+    	SampleFlowNode fx = new SampleFlowNode();
+    	fx.setNodeName("样品分析");
+    	fx.setNodeKey("flw_analysis");
+    	fx.setSort(3550);
+//
+//    	SampleFlowNode fxs = new SampleFlowNode();
+//    	fxs.setNodeName("分析送样");
+//    	fxs.setNodeKey("flw_analysis_send");
+//    	fxs.setSort(3600);
+
+    	SampleFlowNode bzs = new SampleFlowNode();
+    	bzs.setNodeName("班组送样");
+    	bzs.setNodeKey("flw_team_send");
+    	bzs.setSort(3700);
+
+    	SampleFlowNode ypgk = new SampleFlowNode();
+    	ypgk.setNodeName("样品归库");
+    	ypgk.setNodeKey("flw_sample_storage");
+    	ypgk.setSort(3800);
+    	ypgk.setNextFlowNodeList(null);
+    	flowNodeList.add(ypgk);
+    	
+
+    	zxr.setNextFlowNodeList(new ArrayList<SampleFlowNode>() {
+			private static final long serialVersionUID = 6146393613606839512L;
+
+			{
+    			add(BeanUtils.toBean(zxs,SampleFlowNode.class).setIsDefault(true));
+    		}
+    	});
+    	flowNodeList.add(zxr);
+    	
+
+    	zxs.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = 5357543125760924047L;
+
+		{
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setIsDefault(true));
+    	}});
+    	flowNodeList.add(zxs);
+
+    	bzr.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = 6376704859477839016L;
+
+		{
+    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
+    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
+    	}});
+    	flowNodeList.add(bzr);
+    	
+
+    	ypbm.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = 1014984817516902869L;
+
+		{
+    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
+    	}});
+    	flowNodeList.add(ypbm);
+    	
+
+//    	fxr.setNextFlowNodeList(new ArrayList<>() {{
+//    		add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
+//    	}});
+//    	flowNodeList.add(fxr);
+//    	
+//
+//    	fxs.setNextFlowNodeList(new ArrayList<>() {{
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
+//    	}});
+//    	flowNodeList.add(fxs);
+    	
+    	fx.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = -610440034210287957L;
+
+		{
+    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
+    	}});
+    	flowNodeList.add(fx);
+
+    	bzs.setNextFlowNodeList(new ArrayList<>() {
+			private static final long serialVersionUID = -5057434004685743838L;
+
+		{
+//    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("subSampleSelfReportedOthersPending"));//当前部门数据已全部判断上报
+    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("subSampleAlldeptAnalyzed"));//当前样品所有分析任务已全部上报完
+    	}});
+    	flowNodeList.add(bzs);
+    	
+    	sampleFlowDefinition.setFlowNodeList(flowNodeList);
+    	
+    	String jsonSampleFlowDefinition = JSON.toJSONString(sampleFlowDefinition);
+    	
+    	System.out.println(jsonSampleFlowDefinition);
+    	
+    	return success(jsonSampleFlowDefinition);
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectExtendRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class AssayMethodProjectRespVO {
+
+	private Long dictionaryProjectId;
+	
+	private String dictionaryProjectName;
+	
+	private String dictionaryProjectSimpleName;
+	
+	private String dictionaryProjectShowName;
+	
+	private Long configAssayMethodId;
+	
+	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
+	private List<ConfigAssayMethodProjectExtendRespVO> methodList;
+}

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

@@ -44,4 +44,7 @@ public class BusinessAssayParameterDataReqVO {
     @Schema(description = "备注")
     private String remark;
 
+    //===================扩展字段====================
+    @Schema(description = "检测项目业务ID列表")
+    private List<Long> businessAssayProjectDataIdList;
 }

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

@@ -16,6 +16,9 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
 	/** id主键 **/
     private Long id;
     
+    /** 业务数据id 如：T_BSN_ASY_PRJ_DAT表，则为BSN_ASY_TSK_DAT_ID，T_BSN_ASY_PRM_DAT表，则为BSN_ASY_PRJ_DAT_ID **/
+    private Long bizId;
+    
     /** 元素或参数字典id **/
     private Long dicId;
     
@@ -42,6 +45,10 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
     /** 结果值 **/
     @Schema(description = "结果值")
     private String value;
+
+    /** 符号,=、>、<、等 **/
+    @Schema(description = "符号,=、>、<、等")
+    private String symbol;
     
     @Schema(description = "是否允许为空")
     private Integer isNull; 

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

@@ -18,6 +18,9 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
     @Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
     @Schema(description = "子样配置id")
     private Long configSubSampleId;
 

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

@@ -5,9 +5,14 @@ import lombok.Data;
 @Data
 public class BusinessAssayTaskDataGroupRespVO {
 	
+	/** 方法id **/
 	private Long configAssayMethodId;
 	
+	/** 方法名称 **/
 	private String configAssayMethodName;
+	
+	/** 方法名称及类别 **/
+	private String configAssayMethodNameAndCategory;
 
     private String assayType;
 	

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

@@ -105,4 +105,25 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "样品状态")
     private String sampleStatus;
 
+    @Schema(description = "检测方法配置名称")
+    private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
+    @Schema(description = "收样时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveTime;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+    
+    @Schema(description = "样品名称")
+    private String sampleName;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -20,10 +21,16 @@ import lombok.Data;
  */
 @Data
 public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
+	
+	/** 任务单数据类型,横向：horizontal，纵向：‌vertical **/
+    private String reportDataType;
 
 	/** 分析方法名称 **/
     private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
     /** 分析方法对应的分析项目 **/
     private String configAssayMethodProjectShowNames;
     

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

@@ -100,10 +100,10 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")
@@ -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/controller/vo/BusinessAssayTaskParameterDataPageReqVO.java

@@ -0,0 +1,44 @@
+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 BusinessAssayTaskParameterDataPageReqVO extends PageParam {
+
+    @Schema(description = "检测任务ID", example = "11383")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测方法参数配置ID", example = "9000")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", example = "3750")
+    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/controller/vo/BusinessAssayTaskParameterDataRespVO.java

@@ -0,0 +1,55 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 子样检测任务参数业务 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessAssayTaskParameterDataRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2727")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11383")
+    @ExcelProperty("检测任务ID")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9000")
+    @ExcelProperty("检测方法参数配置ID")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    @ExcelProperty("值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "3750")
+    @ExcelProperty("乐观锁")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,43 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 子样检测任务参数业务新增/修改 Request VO")
+@Data
+public class BusinessAssayTaskParameterDataSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2727")
+    private Long id;
+
+    @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11383")
+    @NotNull(message = "检测任务ID不能为空")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9000")
+    @NotNull(message = "检测方法参数配置ID不能为空")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "3750")
+    @NotNull(message = "乐观锁不能为空")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -99,10 +99,10 @@ public class BusinessAssayTaskReqVO {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 
 @Schema(description = "管理后台 - 检测任务分配业务 Response VO")
 @Data
@@ -116,12 +117,13 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
-    @ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
+    @ExcelProperty("完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Dict(dicCode = "flow_status")
-    @ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
+    @ExcelProperty("流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -102,10 +102,10 @@ public class BusinessAssayTaskSaveReqVO {
     @Schema(description = "签名信息")
     private String documentSignature;
 
-    @Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
+    @Schema(description = "完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "2")
     private String finishStatus;
 
-    @Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
+    @Schema(description = "流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed", example = "1")
     private String flowStatus;
 
     @Schema(description = "所属部门")

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

@@ -64,5 +64,16 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //==============扩展字段================
+    
     private Long deptId;
+
+    @Schema(description = "分析编号")
+    private String sampleAssayCode;
+
+    @Schema(description = "归库编号")
+    private String sampleReturnCode;
+    
+    @Schema(description = "样品名称")
+    private String sampleName;
 }

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

@@ -0,0 +1,16 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessQCCoefficientDataExtendRespVO extends BusinessQCCoefficientDataRespVO {
+
+	private String dictionaryBusinessName;
+
+	private String parentDictionaryBusinessId;
+
+	private String parentDictionaryBusinessName;
+
+	private String parentDictionaryBusinesskey;
+
+}

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

@@ -0,0 +1,16 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessQCManagementDataExtendRespVO extends BusinessQCManagementDataRespVO {
+
+	private String dictionaryBusinessName;
+
+	private String parentDictionaryBusinessId;
+
+	private String parentDictionaryBusinessName;
+
+	private String parentDictionaryBusinesskey;
+
+}

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

@@ -0,0 +1,44 @@
+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 = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数分页 Request VO")
+@Data
+public class BusinessQCManagementSampleParameterDataPageReqVO extends PageParam {
+
+    @Schema(description = "质控管理样检测任务ID", example = "100")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法参数配置ID", example = "10419")
+    private Long configAssayMethodParameterId;
+
+    @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 = "乐观锁", example = "2766")
+    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/controller/vo/BusinessQCManagementSampleParameterDataRespVO.java

@@ -0,0 +1,55 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessQCManagementSampleParameterDataRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1205")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "质控管理样检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @ExcelProperty("质控管理样检测任务ID")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10419")
+    @ExcelProperty("检测方法参数配置ID")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    @ExcelProperty("值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    @ExcelProperty("小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "2766")
+    @ExcelProperty("乐观锁")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,43 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数新增/修改 Request VO")
+@Data
+public class BusinessQCManagementSampleParameterDataSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1205")
+    private Long id;
+
+    @Schema(description = "质控管理样检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "质控管理样检测任务ID不能为空")
+    private Long businessQCManagementDataId;
+
+    @Schema(description = "检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10419")
+    @NotNull(message = "检测方法参数配置ID不能为空")
+    private Long configAssayMethodParameterId;
+
+    @Schema(description = "值")
+    private String value;
+
+    @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
+    private String dataType;
+
+    @Schema(description = "小数位")
+    private Integer decimalPosition;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "2766")
+    @NotNull(message = "乐观锁不能为空")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -17,6 +17,11 @@ import lombok.Data;
 @Data
 public class BusinessSampleEntrustDetailExtendRespVO extends BusinessSampleEntrustDetailRespVO {
 	
+	/**
+	 * 样品类型key
+	 */
+    private String sampleTypeDictionaryBusinessKey;
+	
 	/** 样品大类名称 **/
 	private String baseSampleName;
 

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

@@ -156,4 +156,7 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
     //====================扩展字段======================
     @Schema(description = "委托来源名称")
     private String configEntrustSourceName;
+
+    @Schema(description = "报表配置id")
+    private Long configReportTypeId;
 }

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

@@ -6,6 +6,7 @@ import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 
 @Schema(description = "管理后台 - 委检登记业务 Response VO")
 @Data
@@ -144,10 +145,12 @@ public class BusinessSampleEntrustRegistrationRespVO {
     @ExcelProperty("数据校验状态,success-数据校验成功、fail-数据校验失败")
     private String dataCheckStatus;
 
+    @Dict(dicCode = "entrust_assay_status")
     @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
     @ExcelProperty("检验状态,unchecked-未检验；checked-已检验")
     private String assayStatus;
 
+    @Dict(dicCode = "entrust_data_status")
     @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "1")
     @ExcelProperty("数据回报状态,unreturned-未回报；returned-已回报")
     private String dataStatus;

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

@@ -5,6 +5,12 @@ import lombok.Data;
 
 @Data
 public class BusinessSubParentSampleAssessmentExtendRespVO extends BusinessSubParentSampleAssessmentRespVO {
+	
+	@Schema(description = "主样id")
+    private Long businessBaseSampleId;
+	
+	@Schema(description = "分样配置id")
+    private Long configSubSampleParentId;
 
     @Schema(description = "检测项目key")
     private String dictionaryProjectKey;

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

@@ -1,5 +1,11 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+import java.time.LocalDateTime;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,10 +17,17 @@ public class BusinessSubParentSampleAssessmentGroupReqVO {
 	
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 
     @Schema(description = "分析部门ID")
     private Long assayDepartmentId;
 
     @Schema(description = "分析部门名称")
     private String assayDepartmentName;
+
+    @Schema(description = "收样时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveTime;
 }

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

@@ -11,6 +11,9 @@ public class BusinessSubParentSampleAssessmentGroupRespVO {
 	
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 
     @Schema(description = "分析部门ID")
     private Long assayDepartmentId;

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

@@ -15,6 +15,9 @@ public class BusinessSubParentSampleAssessmentProjectPageReqVO extends PageParam
 
     @Schema(description = "样品分样ID", example = "23188")
     private Long businessSubParentSampleId;
+    
+    @Schema(description = "班组判定数据业务ID")
+    private Long businessSubParentSampleAssessmentId;
 
     @Schema(description = "检测项目ID,字典表【T_DIC_PRJ】", example = "17642")
     private Long dictionaryProjectId;

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

@@ -31,6 +31,9 @@ public class BusinessSubSampleAnalysisGroupPageReqVO extends PageParam {
     @Schema(description = "样品状态", example = "1")
     private String sampleStatus;
 
+    @Schema(description = "是否送样")
+    private Integer isSend;
+
     @Schema(description = "收样人")
     private String sampleReceiver;
 

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

@@ -40,6 +40,9 @@ public class BusinessSubSampleAnalysisGroupRespVO {
     @ExcelProperty("样品状态")
     private String sampleStatus;
 
+    @Schema(description = "是否送样")
+    private Integer isSend;
+
     @Schema(description = "收样人")
     @ExcelProperty("收样人")
     private String sampleReceiver;

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

@@ -37,6 +37,9 @@ public class BusinessSubSampleAnalysisGroupSaveReqVO {
     @NotEmpty(message = "样品状态不能为空")
     private String sampleStatus;
 
+    @Schema(description = "是否送样")
+    private Integer isSend;
+
     @Schema(description = "收样人")
     private String sampleReceiver;
 

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

@@ -63,6 +63,9 @@ public class BusinessSubSampleExtendRespVO extends BusinessSubSampleRespVO {
 	
 	@Schema(description = "分析部门名称")
     private String assayDepartmentName;
+	
+	@Schema(description = "是否已送样")
+	private Integer isSendSample;
 
     @Schema(description = "是否打印")
     private Integer isPrint;

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

@@ -145,6 +145,9 @@ public class BusinessSubSamplePageReqVO extends PageParam {
 	@Schema(description = "分析部门状态")
 	private String assayDepartmentStatus;
 	
+	@Schema(description = "是否已送样")
+	private Integer isSendSample;
+	
     @Schema(description = "样品流程节点KEY列表")
     private List<String> sampleFlowNodeKeyList;
     

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

@@ -46,6 +46,9 @@ public class BusinessXRFDataPageReqVO extends PageParam {
     
     @Schema(description = "检测任务ID", example = "16505")
     private Long businessAssayTaskDataId;
+    
+    @Schema(description = "检测任务ID", example = "940")
+    private Long businessQCManagementDataId;
 
     @Schema(description = "检测数据")
     private String assayData;

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

@@ -49,6 +49,9 @@ public class BusinessXRFDataReqVO {
     
     @Schema(description = "检测任务ID", example = "16505")
     private Long businessAssayTaskDataId;
+    
+    @Schema(description = "检测任务ID", example = "940")
+    private Long businessQCManagementDataId;
 
     @Schema(description = "检测数据")
     private String assayData;

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

@@ -58,6 +58,9 @@ public class BusinessXRFDataRespVO {
     
     @Schema(description = "检测任务ID", example = "16505")
     private Long businessAssayTaskDataId;
+    
+    @Schema(description = "检测任务ID", example = "940")
+    private Long businessQCManagementDataId;
 
     @Schema(description = "检测数据", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("检测数据")

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

@@ -51,6 +51,9 @@ public class BusinessXRFDataSaveReqVO {
     
     @Schema(description = "检测任务ID", example = "16505")
     private Long businessAssayTaskDataId;
+    
+    @Schema(description = "检测任务ID", example = "940")
+    private Long businessQCManagementDataId;
 
     @Schema(description = "检测数据", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "检测数据不能为空")

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

@@ -7,10 +7,10 @@ import lombok.Data;
 @Data
 public class ChangeAssayMethodReqVO {
 		
-	private Long businessSubSampleId;
+	private List<Long> businessSubSampleIdList;
 	
 	private Long configAssayMethodId;
 	
-	private List<Long> changeConfigAssayMethodIdList;
+	private List<AssayMethodProjectRespVO> changeConfigAssayMethodProjectList;
 
 }

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

@@ -26,4 +26,7 @@ public class CreateQcSampleReqVO {
 
     @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
     private String dictionaryBusinessKey;
+
+    @Schema(description = "质控类型_父类_Key,字典表【T_DIC_BSN】质控类型：带检测项-withProject 不带检测项目-withoutProject")
+	private String parentDictionaryBusinesskey;
 }

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

@@ -13,6 +13,9 @@ public class DeleteQcSampleReqVO {
 
     @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
     private String dictionaryBusinessKey;
+
+    @Schema(description = "质控类型_父类_Key,字典表【T_DIC_BSN】质控类型：带检测项-withProject 不带检测项目-withoutProject")
+	private String parentDictionaryBusinesskey;
     
     @Schema(description = "质控样id")
     private List<Long> qcSampleIdList;

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

@@ -1,5 +1,7 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.time.LocalDateTime;
+
 import lombok.Data;
 
 @Data
@@ -22,4 +24,7 @@ public class NoReportSubParentSampleAssessmentRespVO {
     private String taskType;
     
     private String assayType;
+
+    
+    private LocalDateTime sampleReceiveTime;
 }

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

@@ -4,6 +4,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;
 
 @Data
@@ -20,6 +21,9 @@ public class RecheckSubSampleParentMethodRespVO {
 	private Long configAssayMethodId;
 	
 	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 	
 	private Long baseSampleId;
 	

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

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

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

@@ -14,8 +14,14 @@ public class UnAssignTaskedSubSampleRespVO implements Serializable {
     @Schema(description = "联合id")
     private String id;
     
+    @Schema(description = "样品大类ID", example = "15112")
+    private Long baseSampleId;
+    
     @Schema(description = "分样子样ID")
     private Long businessSubSampleId;
+
+    @Schema(description = "样品大类名称", example = "张三")
+    private String baseSampleName;
     
     @Schema(description = "样品名称", example = "张三")
     private String sampleName;
@@ -34,6 +40,12 @@ public class UnAssignTaskedSubSampleRespVO implements Serializable {
 
     @Schema(description = "检测方法配置ID", example = "9130")
     private Long configAssayMethodId;
+    
+    @Schema(description = "分析方法名称")
+	private String configAssayMethodName;
+    
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
 
     @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
     private String assayType;

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

@@ -47,6 +47,11 @@ public class BusinessAssayParameterDataDO extends BusinessBaseDO {
     @TableField("DIC_PRM_ID")
     private Long dictionaryParameterId;
     /**
+    * 符号,=、>、<、等
+    */
+    @TableField("SMB")
+    private String symbol;
+    /**
     * 值
     */
     @TableField("VAL")

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.dal.dataobject;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
     import java.time.LocalDateTime;
@@ -109,4 +110,20 @@ public class BusinessAssayReportDataDO extends BusinessBaseDO {
     //样品创建时间
     @TableField(exist = false)
     private LocalDateTime baseSampleCreateTime;
+
+    //样品类型key
+    @TableField(exist = false)
+    private String sampleTypeKey;
+
+    //委托样品名称
+    @TableField(exist = false)
+    private String entrustSampleName;
+
+    //委托样品编号
+    @TableField(exist = false)
+    private String entrustSampleCode;
+
+    //委托明细排序
+    @TableField(exist = false)
+    private Integer entrustDetailSort;
 }

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

@@ -160,12 +160,12 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("DOC_SIG")
     private String documentSignature;
     /**
-    * 完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved
+    * 完成状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed
     */
     @TableField("FIN_STS")
     private String finishStatus;
     /**
-    * 流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved
+    * 流程状态,未开始-not_start、审核中-in_progress、已退回-returned、已通过-completed
     */
     @TableField("FLW_STS")
     private String flowStatus;

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

@@ -1,7 +1,6 @@
 package com.zt.plat.module.qms.business.bus.dal.dataobject;
 
 import lombok.*;
-import java.util.*;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;

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

@@ -0,0 +1,75 @@
+package com.zt.plat.module.qms.business.bus.dal.dataobject;
+
+import lombok.*;
+import java.util.*;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+/**
+* 子样检测任务参数业务 DO
+*
+* @author 后台管理-1
+*/
+@TableName("t_bsn_asy_tsk_prm_dat")
+@KeySequence("t_bsn_asy_tsk_prm_dat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class BusinessAssayTaskParameterDataDO extends BusinessBaseDO {
+
+
+
+    /**
+    * ID
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 检测任务ID
+    */
+    @TableField("BSN_ASY_TSK_DAT_ID")
+    private Long businessAssayTaskDataId;
+    /**
+    * 检测方法参数配置ID
+    */
+    @TableField("CFG_ASY_MTHD_PRM_ID")
+    private Long configAssayMethodParameterId;
+    /**
+    * 值
+    */
+    @TableField("VAL")
+    private String value;
+    /**
+    * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
+    */
+    @TableField("DAT_TP")
+    private String dataType;
+    /**
+    * 小数位
+    */
+    @TableField("DEC_POS")
+    private Integer decimalPosition;
+    /**
+    * 乐观锁
+    */
+    @TableField("UPD_CNT")
+    private Integer updateCount;
+    /**
+    * 所属部门
+    */
+    @TableField("SYS_DEPT_CD")
+    private String systemDepartmentCode;
+    /**
+    * 备注
+    */
+    @TableField("RMK")
+    private String remark;
+
+}

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

@@ -47,6 +47,11 @@ public class BusinessQCCoefficientParameterDataDO extends BusinessBaseDO {
     @TableField("DIC_PRM_ID")
     private Long dictionaryParameterId;
     /**
+    * 符号,=、>、<、等
+    */
+    @TableField("SMB")
+    private String symbol;
+    /**
     * 值
     */
     @TableField("VAL")

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

@@ -47,6 +47,11 @@ public class BusinessQCManagementParameterDataDO extends BusinessBaseDO {
     @TableField("DIC_PRM_ID")
     private Long dictionaryParameterId;
     /**
+    * 符号,=、>、<、等
+    */
+    @TableField("SMB")
+    private String symbol;
+    /**
     * 值
     */
     @TableField("VAL")

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

@@ -0,0 +1,75 @@
+package com.zt.plat.module.qms.business.bus.dal.dataobject;
+
+import lombok.*;
+import java.util.*;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+/**
+* 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数 DO
+*
+* @author 后台管理-1
+*/
+@TableName("t_bsn_qc_mngt_smp_prm_dat")
+@KeySequence("t_bsn_qc_mngt_smp_prm_dat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class BusinessQCManagementSampleParameterDataDO extends BusinessBaseDO {
+
+
+
+    /**
+    * ID
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 质控管理样检测任务ID
+    */
+    @TableField("BSN_QC_MNGT_DAT_ID")
+    private Long businessQCManagementDataId;
+    /**
+    * 检测方法参数配置ID
+    */
+    @TableField("CFG_ASY_MTHD_PRM_ID")
+    private Long configAssayMethodParameterId;
+    /**
+    * 值
+    */
+    @TableField("VAL")
+    private String value;
+    /**
+    * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间
+    */
+    @TableField("DAT_TP")
+    private String dataType;
+    /**
+    * 小数位
+    */
+    @TableField("DEC_POS")
+    private Integer decimalPosition;
+    /**
+    * 乐观锁
+    */
+    @TableField("UPD_CNT")
+    private Integer updateCount;
+    /**
+    * 所属部门
+    */
+    @TableField("SYS_DEPT_CD")
+    private String systemDepartmentCode;
+    /**
+    * 备注
+    */
+    @TableField("RMK")
+    private String remark;
+
+}

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

@@ -90,7 +90,7 @@ public class BusinessSubParentSampleAssessmentProjectDO extends BusinessBaseDO {
     /**
     * 判定值
     */
-    @TableField("ASMT_VAL")
+    @TableField(value = "ASMT_VAL", updateStrategy = FieldStrategy.ALWAYS)
     private String assessmentValue;
     /**
     * 判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差

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

@@ -63,6 +63,11 @@ public class BusinessSubSampleAnalysisGroupDO extends BusinessBaseDO {
     @TableField("SMP_STS")
     private String sampleStatus;
     /**
+    * 是否送样
+    */
+    @TableField("IS_SND")
+    private Integer isSend;
+    /**
     * 收样人
     */
     @TableField("SMP_RCVR")

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

@@ -89,6 +89,11 @@ public class BusinessXRFDataDO extends BusinessBaseDO {
     @TableField("BSN_ASY_TSK_DAT_ID")
     private Long businessAssayTaskDataId;
     /**
+    * 检测任务ID
+    */
+    @TableField("BSN_QC_MNGT_DAT_ID")
+    private Long businessQCManagementDataId;
+    /**
     * 检测数据
     */
     @TableField("ASY_DAT")

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

@@ -31,6 +31,7 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX<BusinessAs
 				.leftJoin(ConfigAssayMethodProjectParameterDO.class, ConfigAssayMethodProjectParameterDO::getId, BusinessAssayParameterDataDO::getConfigAssayMethodProjectParameterId)
 				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodProjectParameterDO::getDictionaryBusinessId)
 				.selectAs(BusinessAssayParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, BusinessAssayProjectAndParameterRespVO::getBizId)
 				.selectAs(BusinessAssayParameterDataDO::getConfigAssayMethodProjectParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getName)
@@ -39,6 +40,7 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX<BusinessAs
 				.selectAs(BusinessAssayParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
 				.selectAs(BusinessAssayParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
 				.selectAs(BusinessAssayParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(BusinessAssayParameterDataDO::getSymbol, BusinessAssayProjectAndParameterRespVO::getSymbol)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
@@ -48,6 +50,7 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX<BusinessAs
 				.selectAs(ConfigAssayMethodProjectParameterDO::getDictionaryBusinessKey, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessKey)
 				.selectAs(DictionaryBusinessDO::getName, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessName)
                 .eqIfPresent(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, reqVO.getBusinessAssayProjectDataId())
+                .inIfPresent(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, reqVO.getBusinessAssayProjectDataIdList())
                 .eqIfPresent(BusinessAssayParameterDataDO::getConfigAssayMethodProjectParameterId, reqVO.getConfigAssayMethodProjectParameterId())
                 .eqIfPresent(BusinessAssayParameterDataDO::getDictionaryParameterId, reqVO.getDictionaryParameterId())
                 .eqIfPresent(BusinessAssayParameterDataDO::getValue, reqVO.getValue())

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

@@ -6,17 +6,17 @@ 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.controller.vo.BusinessAssayProjectAndParameterRespVO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
 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.module.qms.common.dic.dal.dataobject.DictionaryBusinessDO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 检测项目数据业务 Mapper
@@ -32,6 +32,7 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessAssayProjectDataDO::getDictionaryProjectId)
 				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodProjectDO::getDictionaryBusinessId)
 				.selectAs(BusinessAssayProjectDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, BusinessAssayProjectAndParameterRespVO::getBizId)
 				.selectAs(BusinessAssayProjectDataDO::getConfigAssayMethodProjectId, BusinessAssayProjectAndParameterRespVO::getDicId)
 				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
 				//.selectAs(DictionaryProjectDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
@@ -40,6 +41,7 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.selectAs(BusinessAssayProjectDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
 				.selectAs(BusinessAssayProjectDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
 				.selectAs(BusinessAssayProjectDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(BusinessAssayProjectDataDO::getSymbol, BusinessAssayProjectAndParameterRespVO::getSymbol)
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
 				.selectAs(ConfigAssayMethodProjectDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
 				.selectAs(ConfigAssayMethodProjectDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
@@ -85,6 +87,18 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
                 .orderByDesc(BusinessAssayProjectDataDO::getId));
     }
     
+    default List<BusinessAssayProjectDataExtendRespVO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
+    	return selectJoinList(BusinessAssayProjectDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayProjectDataDO>()
+    			.leftJoin(BusinessAssayTaskDataDO.class, BusinessAssayTaskDataDO::getId, BusinessAssayProjectDataDO::getBusinessAssayTaskDataId)
+				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessAssayProjectDataDO::getDictionaryProjectId)
+				.selectAll(BusinessAssayProjectDataDO.class)
+				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectDataExtendRespVO::getDictionaryProjectKey)
+				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectDataExtendRespVO::getSimpleName)
+				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectDataExtendRespVO::getShowName)
+    			.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskId)
+    			.eq(BusinessAssayProjectDataDO::getIsEnabled, QmsCommonConstant.YES));
+    }
+    
     default List<BusinessAssayProjectDataExtendRespVO> selectByBusinessAssayTaskDataId(Long businessAssayTaskDataId) {
     	return selectJoinList(BusinessAssayProjectDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayProjectDataDO>()
 				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessAssayProjectDataDO::getDictionaryProjectId)
@@ -97,11 +111,17 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
     
     default List<BusinessAssayProjectDataExtendRespVO> selectByBusinessAssayTaskDataIds(List<Long> businessAssayTaskDataIds) {
     	return selectJoinList(BusinessAssayProjectDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayProjectDataDO>()
+    			.leftJoin(BusinessAssayTaskDataDO.class, BusinessAssayTaskDataDO::getId, BusinessAssayProjectDataDO::getBusinessAssayTaskDataId)
 				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessAssayProjectDataDO::getDictionaryProjectId)
 				.selectAll(BusinessAssayProjectDataDO.class)
 				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectDataExtendRespVO::getDictionaryProjectKey)
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectDataExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectDataExtendRespVO::getShowName)
+				.selectAs(BusinessAssayTaskDataDO::getAssayOperator, BusinessAssayProjectDataExtendRespVO::getAssayOperator)
+				.selectAs(BusinessAssayTaskDataDO::getAnalysisCount, BusinessAssayProjectDataExtendRespVO::getAnalysisCount)
+				.selectAs(BusinessAssayTaskDataDO::getBusinessBaseSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessBaseSampleId)
+				.selectAs(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubParentSampleId)
+				.selectAs(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubSampleId)
     			.in(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, businessAssayTaskDataIds));
     }
     
@@ -130,4 +150,6 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.eqIfPresent(BusinessAssayProjectDataDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId()));
     }
 
+	List<AssayMethodProjectRespVO> selectAssayMethodProjectByBusinessSubSampleIdListAndConfigAssayMethodId(@Param("businessSubSampleIdList")List<Long> businessSubSampleIdList, @Param("configAssayMethodId") Long configAssayMethodId);
+
 }

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

@@ -46,6 +46,11 @@ public interface BusinessAssayReportDataMapper extends BaseMapperX<BusinessAssay
 				.eqIfPresent(BusinessAssayReportDataDO::getBusinessBaseSampleId, businessBaseSampleId));
 	}
 
+	default List<BusinessAssayReportDataDO> selectBytBusinessBaseSampleIds(List<Long> businessBaseSampleIds) {
+		return selectList(new LambdaQueryWrapperX<BusinessAssayReportDataDO>()
+				.inIfPresent(BusinessAssayReportDataDO::getBusinessBaseSampleId, businessBaseSampleIds));
+	}
+
 	//查询报告待编制数据
 	Page<BusinessAssayReportDataDO> queryWaitingDataForReport(IPage<?> page, @Param("param") BusinessAssayReportDataPageReqVO param);
 

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

@@ -2,7 +2,6 @@ package com.zt.plat.module.qms.business.bus.dal.mapper;
 
 import java.util.*;
 
-import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl.On;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.zt.plat.framework.common.pojo.PageResult;
@@ -16,7 +15,6 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataRe
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
@@ -26,7 +24,6 @@ import cn.hutool.core.util.ObjectUtil;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -47,6 +44,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
 		.selectAll(BusinessAssayTaskDataDO.class)
 		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
 		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
 		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
 		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
@@ -136,7 +134,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByDesc(BusinessAssayTaskDataDO::getId);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
 		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
 
@@ -149,6 +147,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
 		.selectAll(BusinessAssayTaskDataDO.class)
 		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
 		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
 		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
 		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
@@ -238,7 +237,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByDesc(BusinessAssayTaskDataDO::getId);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
         return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
     
@@ -264,6 +263,31 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         		.eq(BusinessAssayTaskDataDO::getIsReported, QmsCommonConstant.NO));		
 	}
 	
+	default List<BusinessAssayTaskDataExtendRespVO> selectBySampleAssayCodesAndConfigAssayMethodId(List<String> sampleAssayCodes, Long configAssayMethodId) {
+		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+				.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+        		.selectAll(BusinessAssayTaskDataDO.class)
+        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.in(BusinessSubSampleDO::getSampleAssayCode, sampleAssayCodes)
+        		.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId)
+        		.eq(BusinessAssayTaskDataDO::getIsReported, QmsCommonConstant.NO));		
+	}
+	
+	default List<BusinessAssayTaskDataExtendRespVO> selectBySampleAssayCodesAndConfigAssayMethodDictionaryBusinessKey(List<String> sampleAssayCodes, String configAssayMethodDictionaryBusinessKey) {
+		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+				.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
+        		.selectAll(BusinessAssayTaskDataDO.class)
+        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.in(BusinessSubSampleDO::getSampleAssayCode, sampleAssayCodes)
+        		.eq(ConfigAssayMethodDO::getDictionaryBusinessKey, configAssayMethodDictionaryBusinessKey)
+        		.eq(BusinessAssayTaskDataDO::getIsReported, QmsCommonConstant.NO));		
+	}
+	
 	default List<BusinessAssayTaskDataExtendRespVO> selectResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
 		MPJLambdaWrapper<BusinessAssayTaskDataDO> mpjLambdaWrapper = new MPJLambdaWrapper<BusinessAssayTaskDataDO>()
 				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
@@ -274,6 +298,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
         		.selectAll(BusinessAssayTaskDataDO.class)
         		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
         		.selectAs(ConfigAssayMethodDO::getConfigReportTemplateKey, BusinessAssayTaskDataExtendRespVO::getConfigReportTemplateKey)
         		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
         		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
@@ -302,6 +327,9 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 					break;
 			}
 		}
+		if (ObjectUtil.isNotEmpty(reqVO.getSampleReceiveTime()) && reqVO.getSampleReceiveTime().length == 2) {
+			mpjLambdaWrapper.between(BusinessSubSampleAnalysisGroupDO::getSampleReceiveTime, reqVO.getSampleReceiveTime()[0], reqVO.getSampleReceiveTime()[1]);
+		}
 		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, "已收样");//已收样
 		mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getBusinessSubSampleId).orderByAsc(BusinessAssayTaskDataDO::getReportTime);
 		
@@ -392,7 +420,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 	
 	/**
 	 * 根据分样查询分析任务
-	 * @param businessSubParentSampleIds 分样样id
+	 * @param businessSubParentSampleIds 分样样id列表
 	 * @param configAssayMethodId 分析方法
 	 * @return
 	 */

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

@@ -49,7 +49,7 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessAssayTaskDetailDO::getId));
+    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
     }
     
     default List<BusinessAssayTaskDetailExtendRespVO> selectList(BusinessAssayTaskDetailReqVO reqVO) {
@@ -80,7 +80,7 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-    			.orderByDesc(BusinessAssayTaskDetailDO::getId));
+    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
     }
 
 	default List<BusinessAssayTaskDetailDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {

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

@@ -29,6 +29,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
         		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDO::getConfigAssayMethodId)
         		.selectAll(BusinessAssayTaskDO.class)
         		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskExtendRespVO::getConfigAssayMethodNameAndCategory)
                 .eqIfPresent(BusinessAssayTaskDO::getTaskNo, reqVO.getTaskNo())
                 .likeIfPresent(BusinessAssayTaskDO::getTaskName, reqVO.getTaskName())
                 .eqIfPresent(BusinessAssayTaskDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
@@ -61,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));
@@ -73,6 +76,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
         		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDO::getConfigAssayMethodId)
         		.selectAll(BusinessAssayTaskDO.class)
         		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskExtendRespVO::getConfigAssayMethodNameAndCategory)
                 .eqIfPresent(BusinessAssayTaskDO::getTaskNo, reqVO.getTaskNo())
                 .likeIfPresent(BusinessAssayTaskDO::getTaskName, reqVO.getTaskName())
                 .eqIfPresent(BusinessAssayTaskDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
@@ -105,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));
@@ -136,6 +142,8 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
 				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDO::getConfigAssayMethodId)
 				.selectAll(BusinessAssayTaskDO.class)
 				.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskExtendRespVO::getConfigAssayMethodNameAndCategory)
+        		.selectAs(ConfigAssayMethodDO::getReportDataType, BusinessAssayTaskExtendRespVO::getReportDataType)
 				.eq(BusinessAssayTaskDO::getId, id));
 	}
 

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

@@ -0,0 +1,64 @@
+package com.zt.plat.module.qms.business.bus.dal.mapper;
+
+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.BusinessAssayProjectDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskParameterDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodParameterDO;
+import com.zt.plat.module.qms.common.dic.dal.dataobject.DictionaryBusinessDO;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 子样检测任务参数业务 Mapper
+ *
+ * @author 后台管理-1
+ */
+@Mapper
+public interface BusinessAssayTaskParameterDataMapper extends BaseMapperX<BusinessAssayTaskParameterDataDO> {
+
+    default PageResult<BusinessAssayTaskParameterDataDO> selectPage(BusinessAssayTaskParameterDataPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessAssayTaskParameterDataDO>()
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getConfigAssayMethodParameterId, reqVO.getConfigAssayMethodParameterId())
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessAssayTaskParameterDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessAssayTaskParameterDataDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessAssayTaskParameterDataDO::getId));
+    }
+
+	default List<BusinessAssayProjectAndParameterRespVO> selectByBusinessAssayTaskDataIds(List<Long> businessAssayTaskDataIdList) {
+		return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskParameterDataDO>()
+				.leftJoin(ConfigAssayMethodParameterDO.class, ConfigAssayMethodParameterDO::getId, BusinessAssayTaskParameterDataDO::getConfigAssayMethodParameterId)
+				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodParameterDO::getDictionaryBusinessId)
+				.selectAs(BusinessAssayTaskParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessAssayTaskParameterDataDO::getBusinessAssayTaskDataId, BusinessAssayProjectAndParameterRespVO::getBizId)
+				.selectAs(BusinessAssayTaskParameterDataDO::getConfigAssayMethodParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(ConfigAssayMethodParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				.selectAs(ConfigAssayMethodParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(ConfigAssayMethodParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(ConfigAssayMethodParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
+				.selectAs(BusinessAssayTaskParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessAssayTaskParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessAssayTaskParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				//.selectAs(ConfigAssayMethodParameterDO::getDictionaryProjectUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigAssayMethodParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				//.selectAs(ConfigAssayMethodParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigAssayMethodParameterDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'attribute'", BusinessAssayProjectAndParameterRespVO::getType)
+				.selectAs(ConfigAssayMethodParameterDO::getDictionaryBusinessId, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessId)
+				.selectAs(ConfigAssayMethodParameterDO::getDictionaryBusinessKey, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessKey)
+				.selectAs(DictionaryBusinessDO::getName, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessName)
+				.in(BusinessAssayTaskParameterDataDO::getBusinessAssayTaskDataId, businessAssayTaskDataIdList)
+                .orderByAsc(ConfigAssayMethodParameterDO::getSortNo));
+	}
+
+}

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

@@ -47,7 +47,10 @@ public interface BusinessHandoverRecordSubMapper extends BaseMapperX<BusinessHan
                 .eqIfPresent(BusinessHandoverRecordSubDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessHandoverRecordSubDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessHandoverRecordSubDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(BusinessHandoverRecordSubDO::getDeptId, reqVO.getDeptId())                
+                .eqIfPresent(BusinessSubSampleDO::getSampleAssayCode, reqVO.getSampleAssayCode())
+                .eqIfPresent(BusinessSubSampleDO::getSampleReturnCode, reqVO.getSampleReturnCode())
+                .likeIfPresent(BusinessSubSampleDO::getSampleName, reqVO.getSampleName())
+                .eqIfPresent(BusinessHandoverRecordSubDO::getDeptId, reqVO.getDeptId())
                 .orderByDesc(BusinessHandoverRecordSubDO::getCreateTime));
     }
     

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

@@ -1,11 +1,16 @@
 package com.zt.plat.module.qms.business.bus.dal.mapper;
 
 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.BusinessQCCoefficientDataDO;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodDO;
+import com.zt.plat.module.qms.common.dic.dal.dataobject.DictionaryBusinessDO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -17,58 +22,75 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BusinessQCCoefficientDataMapper extends BaseMapperX<BusinessQCCoefficientDataDO> {
 
-    default PageResult<BusinessQCCoefficientDataDO> selectPage(BusinessQCCoefficientDataPageReqVO reqVO) {
+    default PageResult<BusinessQCCoefficientDataExtendRespVO> selectPage(BusinessQCCoefficientDataPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessQCCoefficientDataDO>()
+    	MPJLambdaWrapperX<BusinessQCCoefficientDataDO> queryLambdaWrapperX = new MPJLambdaWrapperX<BusinessQCCoefficientDataDO>();
-                .eqIfPresent(BusinessQCCoefficientDataDO::getSampleCode, reqVO.getSampleCode())
+    	queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd1", DictionaryBusinessDO::getId, BusinessQCCoefficientDataDO::getDictionaryBusinessId);
-                .likeIfPresent(BusinessQCCoefficientDataDO::getSampleName, reqVO.getSampleName())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd2", DictionaryBusinessDO::getId, "dbd1", DictionaryBusinessDO::getParentId);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+		queryLambdaWrapperX = queryLambdaWrapperX.selectAll(BusinessQCCoefficientDataDO.class);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getParentId, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessId);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getKey, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinesskey);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessName);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayProject, reqVO.getAssayProject())
+		queryLambdaWrapperX.eqIfPresent(BusinessQCCoefficientDataDO::getSampleCode, reqVO.getSampleCode())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
+					        .likeIfPresent(BusinessQCCoefficientDataDO::getSampleName, reqVO.getSampleName())
-                .likeIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperator, reqVO.getAssayOperator())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
-                .betweenIfPresent(BusinessQCCoefficientDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getIsReported, reqVO.getIsReported())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayProject, reqVO.getAssayProject())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getReporterId, reqVO.getReporterId())
+					        .likeIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
-                .betweenIfPresent(BusinessQCCoefficientDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperator, reqVO.getAssayOperator())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCCoefficientDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
-                .betweenIfPresent(BusinessQCCoefficientDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getRemark, reqVO.getRemark())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getIsReported, reqVO.getIsReported())
-                .orderByDesc(BusinessQCCoefficientDataDO::getId));
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getReporterId, reqVO.getReporterId())
+					        .betweenIfPresent(BusinessQCCoefficientDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCCoefficientDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getRemark, reqVO.getRemark())
+					        .orderByDesc(BusinessQCCoefficientDataDO::getId);
+    	
+        return selectJoinPage(reqVO, BusinessQCCoefficientDataExtendRespVO.class, queryLambdaWrapperX);
     }
 
-	default List<BusinessQCCoefficientDataDO> selectList(BusinessQCCoefficientDataReqVO reqVO) {
+	default List<BusinessQCCoefficientDataExtendRespVO> selectList(BusinessQCCoefficientDataReqVO reqVO) {
-		return selectList(new LambdaQueryWrapperX<BusinessQCCoefficientDataDO>()
+    	MPJLambdaWrapperX<BusinessQCCoefficientDataDO> queryLambdaWrapperX = new MPJLambdaWrapperX<BusinessQCCoefficientDataDO>();
-                .eqIfPresent(BusinessQCCoefficientDataDO::getSampleCode, reqVO.getSampleCode())
+    	queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd1", DictionaryBusinessDO::getId, BusinessQCCoefficientDataDO::getDictionaryBusinessId);
-                .likeIfPresent(BusinessQCCoefficientDataDO::getSampleName, reqVO.getSampleName())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd2", DictionaryBusinessDO::getId, "dbd1", DictionaryBusinessDO::getParentId);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+		queryLambdaWrapperX = queryLambdaWrapperX.selectAll(BusinessQCCoefficientDataDO.class);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getParentId, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessId);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getKey, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinesskey);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCCoefficientDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessName);
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayProject, reqVO.getAssayProject())
+		queryLambdaWrapperX.eqIfPresent(BusinessQCCoefficientDataDO::getSampleCode, reqVO.getSampleCode())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
+					        .likeIfPresent(BusinessQCCoefficientDataDO::getSampleName, reqVO.getSampleName())
-                .likeIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperator, reqVO.getAssayOperator())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
-                .betweenIfPresent(BusinessQCCoefficientDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getIsReported, reqVO.getIsReported())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayProject, reqVO.getAssayProject())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getReporterId, reqVO.getReporterId())
+					        .likeIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
-                .betweenIfPresent(BusinessQCCoefficientDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperator, reqVO.getAssayOperator())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCCoefficientDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
-                .betweenIfPresent(BusinessQCCoefficientDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
-                .eqIfPresent(BusinessQCCoefficientDataDO::getRemark, reqVO.getRemark())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getIsReported, reqVO.getIsReported())
-                .orderByDesc(BusinessQCCoefficientDataDO::getId));
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getReporterId, reqVO.getReporterId())
+					        .betweenIfPresent(BusinessQCCoefficientDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCCoefficientDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCCoefficientDataDO::getRemark, reqVO.getRemark())
+					        .orderByDesc(BusinessQCCoefficientDataDO::getId);
+		return selectJoinList(BusinessQCCoefficientDataExtendRespVO.class, queryLambdaWrapperX);
 	}
 
 	default List<BusinessQCCoefficientDataDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
@@ -82,4 +104,13 @@ public interface BusinessQCCoefficientDataMapper extends BaseMapperX<BusinessQCC
 				.eq(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, dictionaryBusinessKey));
 	}
 
+	default List<BusinessQCCoefficientDataDO> selectBySampleAssayCodesAndConfigAssayMethodDictionaryBusinessKey(List<String> sampleCodeList, String configAssayMethodDictionaryBusinessKey) {
+		return selectJoinList(BusinessQCCoefficientDataDO.class, new MPJLambdaWrapperX<BusinessQCCoefficientDataDO>()
+				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessQCCoefficientDataDO::getConfigAssayMethodId)
+				.selectAll(BusinessQCCoefficientDataDO.class)
+				.in(BusinessQCCoefficientDataDO::getSampleCode, sampleCodeList)
+				.eq(BusinessQCCoefficientDataDO::getIsReported, QmsCommonConstant.NO)
+				.eq(ConfigAssayMethodDO::getDictionaryBusinessKey, configAssayMethodDictionaryBusinessKey));
+	}
+
 }

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

@@ -8,6 +8,7 @@ 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.BusinessAssayTaskParameterDataDO;
 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.common.dic.dal.dataobject.DictionaryBusinessDO;
@@ -42,6 +43,7 @@ public interface BusinessQCCoefficientParameterDataMapper extends BaseMapperX<Bu
     			.leftJoin(ConfigQCSampleMethodParameterDO.class, ConfigQCSampleMethodParameterDO::getId, BusinessQCCoefficientParameterDataDO::getConfigQCSampleMethodParameterId)
 				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigQCSampleMethodParameterDO::getDictionaryBusinessId)
 				.selectAs(BusinessQCCoefficientParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, BusinessAssayProjectAndParameterRespVO::getBizId)
 				.selectAs(BusinessQCCoefficientParameterDataDO::getConfigQCSampleMethodParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
 				.selectAs(ConfigQCSampleMethodParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
 				.selectAs(ConfigQCSampleMethodParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getName)
@@ -50,6 +52,7 @@ public interface BusinessQCCoefficientParameterDataMapper extends BaseMapperX<Bu
 				.selectAs(BusinessQCCoefficientParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
 				.selectAs(BusinessQCCoefficientParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
 				.selectAs(BusinessQCCoefficientParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(BusinessQCCoefficientParameterDataDO::getSymbol, BusinessAssayProjectAndParameterRespVO::getSymbol)
 				.selectAs(ConfigQCSampleMethodParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
 				.selectAs(ConfigQCSampleMethodParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
 				.selectAs(ConfigQCSampleMethodParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.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.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
+import com.zt.plat.module.qms.common.dic.dal.dataobject.DictionaryBusinessDO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -17,63 +22,95 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BusinessQCManagementDataMapper extends BaseMapperX<BusinessQCManagementDataDO> {
 
-    default PageResult<BusinessQCManagementDataDO> selectPage(BusinessQCManagementDataPageReqVO reqVO) {
+    default PageResult<BusinessQCManagementDataExtendRespVO> selectPage(BusinessQCManagementDataPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessQCManagementDataDO>()
+    	MPJLambdaWrapperX<BusinessQCManagementDataDO> queryLambdaWrapperX = new MPJLambdaWrapperX<>();
-                .eqIfPresent(BusinessQCManagementDataDO::getSampleCode, reqVO.getSampleCode())
+    	queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd1", DictionaryBusinessDO::getId, BusinessQCManagementDataDO::getDictionaryBusinessId);
-                .likeIfPresent(BusinessQCManagementDataDO::getSampleName, reqVO.getSampleName())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd2", DictionaryBusinessDO::getId, "dbd1", DictionaryBusinessDO::getParentId);
-                .eqIfPresent(BusinessQCManagementDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+		queryLambdaWrapperX = queryLambdaWrapperX.selectAll(BusinessQCManagementDataDO.class);
-                .eqIfPresent(BusinessQCManagementDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName);
-                .eqIfPresent(BusinessQCManagementDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getParentId, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessId);
-                .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getKey, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinesskey);
-                .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessName);
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayProject, reqVO.getAssayProject())
+		queryLambdaWrapperX.eqIfPresent(BusinessQCManagementDataDO::getSampleCode, reqVO.getSampleCode())
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
+					        .likeIfPresent(BusinessQCManagementDataDO::getSampleName, reqVO.getSampleName())
-                .likeIfPresent(BusinessQCManagementDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
+					        .eqIfPresent(BusinessQCManagementDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayOperator, reqVO.getAssayOperator())
+					        .eqIfPresent(BusinessQCManagementDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
+					        .eqIfPresent(BusinessQCManagementDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
-                .betweenIfPresent(BusinessQCManagementDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
-                .eqIfPresent(BusinessQCManagementDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
+					        .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
-                .eqIfPresent(BusinessQCManagementDataDO::getIsReported, reqVO.getIsReported())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayProject, reqVO.getAssayProject())
-                .eqIfPresent(BusinessQCManagementDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
-                .eqIfPresent(BusinessQCManagementDataDO::getReporterId, reqVO.getReporterId())
+					        .likeIfPresent(BusinessQCManagementDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
-                .betweenIfPresent(BusinessQCManagementDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayOperator, reqVO.getAssayOperator())
-                .eqIfPresent(BusinessQCManagementDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
-                .eqIfPresent(BusinessQCManagementDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCManagementDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
-                .betweenIfPresent(BusinessQCManagementDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
-                .eqIfPresent(BusinessQCManagementDataDO::getRemark, reqVO.getRemark())
+					        .eqIfPresent(BusinessQCManagementDataDO::getIsReported, reqVO.getIsReported())
-                .orderByDesc(BusinessQCManagementDataDO::getId));
+					        .eqIfPresent(BusinessQCManagementDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCManagementDataDO::getReporterId, reqVO.getReporterId())
+					        .betweenIfPresent(BusinessQCManagementDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCManagementDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCManagementDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getRemark, reqVO.getRemark())
+					        .orderByDesc(BusinessQCManagementDataDO::getId);
+    	
+        return selectJoinPage(reqVO, BusinessQCManagementDataExtendRespVO.class, queryLambdaWrapperX);
     }
 
-	default List<BusinessQCManagementDataDO> selectList(BusinessQCManagementDataReqVO reqVO) {
+	default List<BusinessQCManagementDataExtendRespVO> selectList(BusinessQCManagementDataReqVO reqVO) {
-		return selectList(new LambdaQueryWrapperX<BusinessQCManagementDataDO>()
+    	MPJLambdaWrapperX<BusinessQCManagementDataDO> queryLambdaWrapperX = new MPJLambdaWrapperX<>();
-                .eqIfPresent(BusinessQCManagementDataDO::getSampleCode, reqVO.getSampleCode())
+    	queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd1", DictionaryBusinessDO::getId, BusinessQCManagementDataDO::getDictionaryBusinessId);
-                .likeIfPresent(BusinessQCManagementDataDO::getSampleName, reqVO.getSampleName())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.leftJoin(DictionaryBusinessDO.class, "dbd2", DictionaryBusinessDO::getId, "dbd1", DictionaryBusinessDO::getParentId);
-                .eqIfPresent(BusinessQCManagementDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+		queryLambdaWrapperX = queryLambdaWrapperX.selectAll(BusinessQCManagementDataDO.class);
-                .eqIfPresent(BusinessQCManagementDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName);
-                .eqIfPresent(BusinessQCManagementDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd1", DictionaryBusinessDO::getParentId, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessId);
-                .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getKey, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinesskey);
-                .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
+		queryLambdaWrapperX = (MPJLambdaWrapperX<BusinessQCManagementDataDO>) queryLambdaWrapperX.selectAs("dbd2", DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getParentDictionaryBusinessName);
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayProject, reqVO.getAssayProject())
+		queryLambdaWrapperX.eqIfPresent(BusinessQCManagementDataDO::getSampleCode, reqVO.getSampleCode())
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
+					        .likeIfPresent(BusinessQCManagementDataDO::getSampleName, reqVO.getSampleName())
-                .likeIfPresent(BusinessQCManagementDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
+					        .eqIfPresent(BusinessQCManagementDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayOperator, reqVO.getAssayOperator())
+					        .eqIfPresent(BusinessQCManagementDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
-                .eqIfPresent(BusinessQCManagementDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
+					        .eqIfPresent(BusinessQCManagementDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId())
-                .betweenIfPresent(BusinessQCManagementDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId())
-                .eqIfPresent(BusinessQCManagementDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
+					        .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey())
-                .eqIfPresent(BusinessQCManagementDataDO::getIsReported, reqVO.getIsReported())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayProject, reqVO.getAssayProject())
-                .eqIfPresent(BusinessQCManagementDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
-                .eqIfPresent(BusinessQCManagementDataDO::getReporterId, reqVO.getReporterId())
+					        .likeIfPresent(BusinessQCManagementDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
-                .betweenIfPresent(BusinessQCManagementDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayOperator, reqVO.getAssayOperator())
-                .eqIfPresent(BusinessQCManagementDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCManagementDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
-                .eqIfPresent(BusinessQCManagementDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCManagementDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
-                .betweenIfPresent(BusinessQCManagementDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
-                .eqIfPresent(BusinessQCManagementDataDO::getRemark, reqVO.getRemark())
+					        .eqIfPresent(BusinessQCManagementDataDO::getIsReported, reqVO.getIsReported())
-                .orderByDesc(BusinessQCManagementDataDO::getId));
+					        .eqIfPresent(BusinessQCManagementDataDO::getReporter, reqVO.getReporter())
+					        .eqIfPresent(BusinessQCManagementDataDO::getReporterId, reqVO.getReporterId())
+					        .betweenIfPresent(BusinessQCManagementDataDO::getReportTime, reqVO.getReportTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getUpdateCount, reqVO.getUpdateCount())
+					        .eqIfPresent(BusinessQCManagementDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+					        .betweenIfPresent(BusinessQCManagementDataDO::getCreateTime, reqVO.getCreateTime())
+					        .eqIfPresent(BusinessQCManagementDataDO::getRemark, reqVO.getRemark())
+					        .orderByDesc(BusinessQCManagementDataDO::getId);
+		return selectJoinList(BusinessQCManagementDataExtendRespVO.class, queryLambdaWrapperX);
 	}
 	
 	default List<BusinessQCManagementDataDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
 		return selectList(new LambdaQueryWrapperX<BusinessQCManagementDataDO>()
 				.eq(BusinessQCManagementDataDO::getBusinessAssayTaskId, businessAssayTaskId));		
 	}
+	
+	default List<BusinessQCManagementDataDO> selectByBusinessAssayTaskIdAndDictionaryBusinessKey(Long businessAssayTaskId, String configAssayMethodDictionaryBusinessKey) {
+		return selectList(new LambdaQueryWrapperX<BusinessQCManagementDataDO>()
+				.eq(BusinessQCManagementDataDO::getBusinessAssayTaskId, businessAssayTaskId)
+				.eq(BusinessQCManagementDataDO::getDictionaryBusinessKey, configAssayMethodDictionaryBusinessKey));
+	}
+
+	default List<BusinessQCManagementDataDO> selectBySampleAssayCodesAndConfigAssayMethodDictionaryBusinessKey(List<String> sampleCodeList, String configAssayMethodDictionaryBusinessKey){
+		return selectJoinList(BusinessQCManagementDataDO.class, new MPJLambdaWrapperX<BusinessQCManagementDataDO>()
+				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessQCManagementDataDO::getConfigAssayMethodId)
+				.selectAll(BusinessQCManagementDataDO.class)
+				.in(BusinessQCManagementDataDO::getSampleCode, sampleCodeList)
+				.eq(ConfigAssayMethodDO::getDictionaryBusinessKey, configAssayMethodDictionaryBusinessKey)
+				.eq(BusinessQCManagementDataDO::getIsReported, QmsCommonConstant.NO));
+	}
 
 }

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

@@ -6,6 +6,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.BusinessQCCoefficientParameterDataDO;
 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;
@@ -41,6 +42,7 @@ public interface BusinessQCManagementParameterDataMapper extends BaseMapperX<Bus
 				.leftJoin(ConfigAssayMethodProjectParameterDO.class, ConfigAssayMethodProjectParameterDO::getId, BusinessQCManagementParameterDataDO::getConfigAssayMethodProjectParameterId)
 				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodProjectParameterDO::getDictionaryBusinessId)
 				.selectAs(BusinessQCManagementParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, BusinessAssayProjectAndParameterRespVO::getBizId)
 				.selectAs(BusinessQCManagementParameterDataDO::getConfigAssayMethodProjectParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getName)
@@ -49,6 +51,7 @@ public interface BusinessQCManagementParameterDataMapper extends BaseMapperX<Bus
 				.selectAs(BusinessQCManagementParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
 				.selectAs(BusinessQCManagementParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
 				.selectAs(BusinessQCManagementParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(BusinessQCManagementParameterDataDO::getSymbol, BusinessAssayProjectAndParameterRespVO::getSymbol)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
 				.selectAs(ConfigAssayMethodProjectParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)

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

@@ -6,6 +6,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.BusinessAssayTaskParameterDataDO;
 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;
@@ -46,6 +47,7 @@ public interface BusinessQCManagementProjectDataMapper extends BaseMapperX<Busin
 				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessQCManagementProjectDataDO::getDictionaryProjectId)
 				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodProjectDO::getDictionaryBusinessId)
 				.selectAs(BusinessQCManagementProjectDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, BusinessAssayProjectAndParameterRespVO::getBizId)
 				.selectAs(BusinessQCManagementProjectDataDO::getConfigAssayMethodProjectId, BusinessAssayProjectAndParameterRespVO::getDicId)
 				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
 				//.selectAs(DictionaryProjectDO::getName, BusinessAssayProjectAndParameterRespVO::getName)
@@ -54,6 +56,7 @@ public interface BusinessQCManagementProjectDataMapper extends BaseMapperX<Busin
 				.selectAs(BusinessQCManagementProjectDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
 				.selectAs(BusinessQCManagementProjectDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
 				.selectAs(BusinessQCManagementProjectDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				.selectAs(BusinessQCManagementProjectDataDO::getSymbol, BusinessAssayProjectAndParameterRespVO::getSymbol)
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
 				.selectAs(ConfigAssayMethodProjectDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
 				.selectAs(ConfigAssayMethodProjectDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)

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

@@ -0,0 +1,64 @@
+package com.zt.plat.module.qms.business.bus.dal.mapper;
+
+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.BusinessAssayTaskParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementSampleParameterDataDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodParameterDO;
+import com.zt.plat.module.qms.common.dic.dal.dataobject.DictionaryBusinessDO;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 质控管理样检测任务参数业务表,与子样检测任务参数业务表T_BSN_ASY_TSK_PRM_DAT一样，针对标准样、管理样、质控样、监控样等样品的参数 Mapper
+ *
+ * @author 后台管理-1
+ */
+@Mapper
+public interface BusinessQCManagementSampleParameterDataMapper extends BaseMapperX<BusinessQCManagementSampleParameterDataDO> {
+
+    default PageResult<BusinessQCManagementSampleParameterDataDO> selectPage(BusinessQCManagementSampleParameterDataPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<BusinessQCManagementSampleParameterDataDO>()
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getBusinessQCManagementDataId, reqVO.getBusinessQCManagementDataId())
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getConfigAssayMethodParameterId, reqVO.getConfigAssayMethodParameterId())
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getValue, reqVO.getValue())
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition())
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessQCManagementSampleParameterDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessQCManagementSampleParameterDataDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessQCManagementSampleParameterDataDO::getId));
+    }
+
+	default List<BusinessAssayProjectAndParameterRespVO> selectByBusinessQCManagementDataIds(List<Long> businessQCManagementDataIdList) {
+		return selectJoinList(BusinessAssayProjectAndParameterRespVO.class, new MPJLambdaWrapperX<BusinessQCManagementSampleParameterDataDO>()
+				.leftJoin(ConfigAssayMethodParameterDO.class, ConfigAssayMethodParameterDO::getId, BusinessQCManagementSampleParameterDataDO::getConfigAssayMethodParameterId)
+				.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigAssayMethodParameterDO::getDictionaryBusinessId)
+				.selectAs(BusinessQCManagementSampleParameterDataDO::getId, BusinessAssayProjectAndParameterRespVO::getId)
+				.selectAs(BusinessQCManagementSampleParameterDataDO::getBusinessQCManagementDataId, BusinessAssayProjectAndParameterRespVO::getBizId)
+				.selectAs(BusinessQCManagementSampleParameterDataDO::getConfigAssayMethodParameterId, BusinessAssayProjectAndParameterRespVO::getDicId)
+				.selectAs(ConfigAssayMethodParameterDO::getKey, BusinessAssayProjectAndParameterRespVO::getDicKey)
+				.selectAs(ConfigAssayMethodParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getName)
+				.selectAs(ConfigAssayMethodParameterDO::getParameterName, BusinessAssayProjectAndParameterRespVO::getShowName)
+				.selectAs(ConfigAssayMethodParameterDO::getFillingWay, BusinessAssayProjectAndParameterRespVO::getFillingWay)
+				.selectAs(BusinessQCManagementSampleParameterDataDO::getDataType, BusinessAssayProjectAndParameterRespVO::getDataType)
+				.selectAs(BusinessQCManagementSampleParameterDataDO::getDecimalPosition, BusinessAssayProjectAndParameterRespVO::getDecimalPosition)
+				.selectAs(BusinessQCManagementSampleParameterDataDO::getValue, BusinessAssayProjectAndParameterRespVO::getValue)
+				//.selectAs(ConfigAssayMethodParameterDO::getDictionaryProjectUnit, BusinessAssayProjectAndParameterRespVO::getUnit)
+				.selectAs(ConfigAssayMethodParameterDO::getIsNull, BusinessAssayProjectAndParameterRespVO::getIsNull)
+				//.selectAs(ConfigAssayMethodParameterDO::getFormula, BusinessAssayProjectAndParameterRespVO::getFormula)
+				.selectAs(ConfigAssayMethodParameterDO::getSortNo, BusinessAssayProjectAndParameterRespVO::getParamNo)
+				.selectAs("'attribute'", BusinessAssayProjectAndParameterRespVO::getType)
+				.selectAs(ConfigAssayMethodParameterDO::getDictionaryBusinessId, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessId)
+				.selectAs(ConfigAssayMethodParameterDO::getDictionaryBusinessKey, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessKey)
+				.selectAs(DictionaryBusinessDO::getName, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessName)
+				.in(BusinessQCManagementSampleParameterDataDO::getBusinessQCManagementDataId, businessQCManagementDataIdList)
+                .orderByAsc(ConfigAssayMethodParameterDO::getSortNo));
+	}
+
+}

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

@@ -83,20 +83,39 @@ public interface BusinessSampleEntrustDetailMapper extends BaseMapperX<BusinessS
     	return selectList(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>().eq(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, businessSampleEntrustRegistrationId));
     }
     
+    default List<BusinessSampleEntrustDetailExtendRespVO> selectExtendByBusinessSampleEntrustRegistrationId(Long businessSampleEntrustRegistrationId) {
+    	return selectJoinList(BusinessSampleEntrustDetailExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustDetailDO>()
+				.leftJoin(BaseSampleDO.class, BaseSampleDO::getId, BusinessSampleEntrustDetailDO::getBaseSampleId)
+				.selectAll(BusinessSampleEntrustDetailDO.class)
+				.selectAs(BaseSampleDO::getDictionaryBusinessKey, BusinessSampleEntrustDetailExtendRespVO::getSampleTypeDictionaryBusinessKey)
+    			.eq(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, businessSampleEntrustRegistrationId));
+    }
+    
+    default List<BusinessSampleEntrustDetailDO> selectByBusinessSampleEntrustRegistrationIds(List<Long> businessSampleEntrustRegistrationIds) {
+    	return selectList(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>().in(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, businessSampleEntrustRegistrationIds));
+    }
+    
     default BusinessSampleEntrustDetailDO selectByBusinessBaseSampleId(Long businessBaseSampleId) {
     	return selectOne(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>().eq(BusinessSampleEntrustDetailDO::getBusinessBaseSampleId, businessBaseSampleId));
     }
     
+    default List<BusinessSampleEntrustDetailDO> selectByBusinessBaseSampleIds(List<Long> businessBaseSampleIds) {
+    	return selectList(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>().in(BusinessSampleEntrustDetailDO::getBusinessBaseSampleId, businessBaseSampleIds));
+    }
+    
     /**
      * 查询当前批次的第一条数据
      * @param businessBaseSampleId 任意一条的主样id
+     * @param baseSampleDictionaryBusinessKey 样品大类类型key
      * @return
      */
-    default BusinessSampleEntrustDetailDO selectCurrBatchFirstByBusinessBaseSampleId(Long businessBaseSampleId) {
+    default BusinessSampleEntrustDetailDO selectCurrBatchFirstByBusinessBaseSampleIdAndBaseSampleDictionaryBusinessKey(Long businessBaseSampleId, String baseSampleDictionaryBusinessKey) {
     	BusinessSampleEntrustDetailDO businessSampleEntrustDetailDO = selectByBusinessBaseSampleId(businessBaseSampleId);
     	//查询当前委托的第一条
-    	return selectOne(new LambdaQueryWrapperX<BusinessSampleEntrustDetailDO>()
+    	return selectJoinOne(BusinessSampleEntrustDetailDO.class, new MPJLambdaWrapperX<BusinessSampleEntrustDetailDO>()
+    			.leftJoin(BaseSampleDO.class, BaseSampleDO::getId, BusinessSampleEntrustDetailDO::getBaseSampleId)
     			.eq(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, businessSampleEntrustDetailDO.getBusinessSampleEntrustRegistrationId())
+    			.eq(BaseSampleDO::getDictionaryBusinessKey, baseSampleDictionaryBusinessKey)
     			.orderByAsc(BusinessSampleEntrustDetailDO::getSort)
     			.last(" limit 1 "));
     	

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentMapper.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.BusinessSubParentSampleAssessmentDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -34,6 +37,12 @@ public interface BusinessSubParentSampleAssessmentMapper extends BaseMapperX<Bus
                 .eqIfPresent(BusinessSubParentSampleAssessmentDO::getRemark, reqVO.getRemark())
                 .orderByDesc(BusinessSubParentSampleAssessmentDO::getId));
     }
+
+    default List<BusinessSubParentSampleAssessmentDO> selectByBusinessSubParentSampleIds(List<Long> businessSubParentSampleIds) {
+    	return selectJoinList(BusinessSubParentSampleAssessmentDO.class, new MPJLambdaWrapperX<BusinessSubParentSampleAssessmentDO>()
+    			.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId)
+    			.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds));
+    }
     
     default BusinessSubParentSampleAssessmentDO selectByBusinessSubParentSampleIdAndConfigAssayMethodId(Long businessSubParentSampleId, Long configAssayMethodId) {
     	return selectOne(new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentDO>()
@@ -41,11 +50,22 @@ public interface BusinessSubParentSampleAssessmentMapper extends BaseMapperX<Bus
     			.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
     }
 
-    default List<BusinessSubParentSampleAssessmentDO> selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(List<Long> businessSubParentSampleIds,
+    default List<BusinessSubParentSampleAssessmentExtendRespVO> selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(List<Long> businessSubParentSampleIds, Long configAssayMethodId) {
-			Long configAssayMethodId) {
+    	return selectJoinList(BusinessSubParentSampleAssessmentExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubParentSampleAssessmentDO>()
-    	return selectList(new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentDO>()
+    			.leftJoin(BusinessSubParentSampleDO.class, BusinessSubParentSampleDO::getId, BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId)
+    			.selectAll(BusinessSubParentSampleAssessmentDO.class)
+    			.selectAs(BusinessSubParentSampleDO::getConfigSubSampleParentId, BusinessSubParentSampleAssessmentExtendRespVO::getConfigSubSampleParentId)
+    			.selectAs(BusinessSubParentSampleDO::getBusinessBaseSampleId, BusinessSubParentSampleAssessmentExtendRespVO::getBusinessBaseSampleId)
     			.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
     			.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
     }
 
+    default List<BusinessSubParentSampleAssessmentDO> selectByBusinessSubParentSampleIdsAndAssayDepartmentId(List<Long> businessSubParentSampleIds,
+			Long assayDepartmentId) {
+    	return selectJoinList(BusinessSubParentSampleAssessmentDO.class, new MPJLambdaWrapperX<BusinessSubParentSampleAssessmentDO>()
+    			.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId)
+    			.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
+    			.eq(ConfigAssayMethodDO::getAssayDepartmentId, assayDepartmentId));
+    }
+
 }

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

@@ -28,6 +28,7 @@ public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapp
     default PageResult<BusinessSubParentSampleAssessmentProjectDO> selectPage(BusinessSubParentSampleAssessmentProjectPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentProjectDO>()
                 .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
+                .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleAssessmentId, reqVO.getBusinessSubParentSampleAssessmentId())
                 .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
                 .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
                 .eqIfPresent(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
@@ -69,9 +70,16 @@ public interface BusinessSubParentSampleAssessmentProjectMapper extends BaseMapp
     			.eq(BusinessSubParentSampleAssessmentProjectDO::getConfigAssayMethodId, configAssayMethodId));
     }
 
-	List<NoReportSubParentSampleAssessmentRespVO> selectNoReportSubParentSampleAssessment(@Param("configAssayMethodId") Long configAssayMethodId);
+    default List<BusinessSubParentSampleAssessmentProjectDO> selectByBusinessSubParentSampleAssessmentIdAndDictionaryProjectIds(Long businessSubParentSampleAssessmentId, List<Long> recheckDictionaryProjectIdList) {
+		return selectList(new LambdaQueryWrapper<BusinessSubParentSampleAssessmentProjectDO>()
+				.eq(BusinessSubParentSampleAssessmentProjectDO::getBusinessSubParentSampleAssessmentId, businessSubParentSampleAssessmentId)
+				.in(BusinessSubParentSampleAssessmentProjectDO::getDictionaryProjectId, recheckDictionaryProjectIdList));
+	}
+
+	List<NoReportSubParentSampleAssessmentRespVO> selectNoReportSubParentSampleAssessment(@Param("reqVO") BusinessSubParentSampleAssessmentGroupReqVO reqVO);
 	
-	List<RecheckSubSampleParentMethodRespVO> getRecheckAssayMethodList(@Param("baseSampleId") Long baseSampleId, @Param("businessSubParentSampleId") Long businessSubParentSampleId, @Param("configAssayMethodId") Long configAssayMethodId);
+	List<RecheckSubSampleParentMethodRespVO> getRecheckAssayMethodList(@Param("baseSampleId") Long baseSampleId, @Param("businessSubParentSampleId") Long businessSubParentSampleId, @Param("configAssayMethodId") Long configAssayMethodId, @Param("assayDepartmentId") Long assayDepartmentId);
+
     
 
 }

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

@@ -45,5 +45,10 @@ public interface BusinessSubParentSampleMapper extends BaseMapperX<BusinessSubPa
     	return selectList(new LambdaQueryWrapperX<BusinessSubParentSampleDO>()
     			.eq(BusinessSubParentSampleDO::getBusinessBaseSampleId, businessBaseSampleId));
     }
+    
+    default List<BusinessSubParentSampleDO> selectByBusinessBaseSampleIds(List<Long> businessBaseSampleIds) {
+    	return selectList(new LambdaQueryWrapperX<BusinessSubParentSampleDO>()
+    			.in(BusinessSubParentSampleDO::getBusinessBaseSampleId, businessBaseSampleIds));
+    }
 
 }

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

@@ -27,6 +27,7 @@ public interface BusinessSubSampleAnalysisGroupMapper extends BaseMapperX<Busine
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
                 .likeIfPresent(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus())
+                .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getIsSend, reqVO.getIsSend())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleReceiver, reqVO.getSampleReceiver())
                 .betweenIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleReceiveTime, reqVO.getSampleReceiveTime())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
@@ -46,6 +47,12 @@ public interface BusinessSubSampleAnalysisGroupMapper extends BaseMapperX<Busine
     			.in(BusinessSubSampleAnalysisGroupDO::getBusinessSubParentSampleId, businessSubParentSampleIds));
     }
     
+    default List<BusinessSubSampleAnalysisGroupDO> selectByBusinessSubParentSampleIdsAndAssayDepartmentId(List<Long> businessSubParentSampleIds, Long assayDepartmentId) {
+    	return selectList(new LambdaQueryWrapperX<BusinessSubSampleAnalysisGroupDO>()
+    			.in(BusinessSubSampleAnalysisGroupDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
+    			.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, assayDepartmentId));
+    }
+    
     default List<BusinessSubSampleAnalysisGroupDO> selectByBusinessSubSampleId(Long businessSubSampleId) {
     	return selectList(new LambdaQueryWrapperX<BusinessSubSampleAnalysisGroupDO>()
     			.eq(BusinessSubSampleAnalysisGroupDO::getBusinessSubSampleId, businessSubSampleId));

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

@@ -37,6 +37,18 @@ public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessS
                 .orderByDesc(BusinessSubSampleAssessmentDO::getId));
     }
     
+    default BusinessSubSampleAssessmentDO selectByBusinessSubParentSampleIdAndConfigAssayMethodId(Long businessSubParentSampleId, Long configAssayMethodId) {
+    	return selectOne(new LambdaQueryWrapperX<BusinessSubSampleAssessmentDO>()
+    			.eq(BusinessSubSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleId)
+    			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    }
+    
+    default List<BusinessSubSampleAssessmentDO> selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(List<Long> businessSubParentSampleIds, Long configAssayMethodId) {
+    	return selectList(new LambdaQueryWrapperX<BusinessSubSampleAssessmentDO>()
+    			.in(BusinessSubSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
+    			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    }
+    
     default BusinessSubSampleAssessmentDO selectByBusinessSubSampleIdAndConfigAssayMethodId(Long businessSubSampleId, Long configAssayMethodId) {
     	return selectOne(new LambdaQueryWrapperX<BusinessSubSampleAssessmentDO>()
     			.eq(BusinessSubSampleAssessmentDO::getBusinessSubSampleId, businessSubSampleId)

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

@@ -144,8 +144,8 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getAssayDepartmentStatus())
-                .orderByAsc(BusinessSubSampleDO::getSampleCode)
+                .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getIsSend, reqVO.getIsSendSample())
-				);
+                .orderByDesc(BusinessSubSampleDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleCode));
 	}
 
 	default List<BusinessSubSampleExtendRespVO> selectList(@Valid BusinessSubSampleReqVO reqVO) {

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

@@ -30,6 +30,7 @@ public interface BusinessXRFDataMapper extends BaseMapperX<BusinessXRFDataDO> {
                 .eqIfPresent(BusinessXRFDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
                 .eqIfPresent(BusinessXRFDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
                 .eqIfPresent(BusinessXRFDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
+                .eqIfPresent(BusinessXRFDataDO::getBusinessQCManagementDataId, reqVO.getBusinessQCManagementDataId())
                 .eqIfPresent(BusinessXRFDataDO::getAssayData, reqVO.getAssayData())
                 .eqIfPresent(BusinessXRFDataDO::getIsCheckCreate, reqVO.getIsCheckCreate())
                 .eqIfPresent(BusinessXRFDataDO::getIsMatched, reqVO.getIsMatched())
@@ -57,6 +58,7 @@ public interface BusinessXRFDataMapper extends BaseMapperX<BusinessXRFDataDO> {
                 .eqIfPresent(BusinessXRFDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
                 .eqIfPresent(BusinessXRFDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
                 .eqIfPresent(BusinessXRFDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
+                .eqIfPresent(BusinessXRFDataDO::getBusinessQCManagementDataId, reqVO.getBusinessQCManagementDataId())
                 .eqIfPresent(BusinessXRFDataDO::getAssayData, reqVO.getAssayData())
                 .eqIfPresent(BusinessXRFDataDO::getIsCheckCreate, reqVO.getIsCheckCreate())
                 .eqIfPresent(BusinessXRFDataDO::getIsMatched, reqVO.getIsMatched())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubProcessUpdateCmp.java

@@ -2,14 +2,16 @@ package com.zt.plat.module.qms.business.bus.liteflow.sample.flow;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.fastjson2.JSON;
-import com.ql.util.express.DefaultContext;
+import com.alibaba.qlexpress4.Express4Runner;
-import com.ql.util.express.ExpressRunner;
+import com.alibaba.qlexpress4.QLOptions;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.zt.plat.framework.common.exception.ServiceException;
@@ -41,7 +43,7 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
 //	private ConfigSubSampleService configSubSampleService;
 	
 	@Resource
-	private ExpressRunner expressRunner;
+	private Express4Runner express4Runner;
 	
 	@Resource
 	private ConfigRuleMapper configRuleMapper;
@@ -89,10 +91,10 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
 				for (SampleFlowNode flowNode : nextFlowNodeList) {
 					ConfigRuleDO conditionRule = configRuleMapper.selectLatestConfigRuleByCode(flowNode.getCondition());
 					Boolean isMeetCondition = false;
-			        DefaultContext<String, Object> context = new DefaultContext<>();
+			        Map<String, Object> context = new HashMap<>();
 			        ConfigSubSampleDO configSubSample = sampleFlowContext.getConfigSubSampleById(businessSubSample.getConfigSubSampleId());
 			        Boolean hasSubSimpleCodeRule = configSubSample != null && StringUtils.isNotBlank(configSubSample.getSimpleCodeRule());
-			        Boolean hasSubSampleEncrypt = businessHandoverRecordSubDOList.stream().anyMatch(m -> QmsCommonConstant.FlOW_NODE_SAMPLE_ENCRYPT.equals(m.getSampleFlowNodeKey()));
+			        Boolean hasSubSampleEncrypt = businessHandoverRecordSubDOList.stream().filter(f -> f.getBusinessSubSampleId().equals(businessSubSample.getId())).anyMatch(m -> QmsCommonConstant.FlOW_NODE_SAMPLE_ENCRYPT.equals(m.getSampleFlowNodeKey()));
 			        
 			        if (CollUtil.isNotEmpty(businessSubSampleAnalysisGroupDOList)) {
 			        	List<BusinessSubSampleAnalysisGroupDO> curSubSampleAnalysisGroupDOList = businessSubSampleAnalysisGroupDOList.stream().filter(f -> f.getBusinessSubSampleId().equals(businessSubSample.getId())).collect(Collectors.toList());
@@ -105,7 +107,8 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
 			        context.put("hasSubSimpleCodeRule", hasSubSimpleCodeRule);
 			        context.put("hasSubSampleEncrypt", hasSubSampleEncrypt);
 					try {
-						isMeetCondition = (Boolean) expressRunner.execute(conditionRule.getExpression(), context, null, false, false);
+//						isMeetCondition = (Boolean) express4Runner.execute(conditionRule.getExpression(), context, null, false, false);
+						isMeetCondition = (Boolean) express4Runner.execute(conditionRule.getExpression(), context, QLOptions.DEFAULT_OPTIONS).getResult();
 					} catch (Exception e) {
 						e.printStackTrace();
 						throw new ServiceException(1_032_100_000, e.getMessage());
@@ -140,6 +143,16 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
 			}
 			sampleFlowContext.setBusinessSubSampleAnalysisGroupList(curDeptSubSampleAnalysisGroupDOList);
 		}
+		
+		//如果是班组送样，需要更新分析班组表
+		if (QmsCommonConstant.FLOW_NODE_ANALYSIS_SEND.equals(currentSampleFlowKey)) {
+			List<BusinessSubSampleAnalysisGroupDO> curDeptSubSampleAnalysisGroupDOList = businessSubSampleAnalysisGroupDOList.stream().filter(f -> f.getAssayDepartmentId().equals(loginUser.getVisitDeptId())).collect(Collectors.toList());
+			for (BusinessSubSampleAnalysisGroupDO businessSubSampleAnalysisGroupDO : curDeptSubSampleAnalysisGroupDOList) {
+				businessSubSampleAnalysisGroupDO.setIsSend(QmsCommonConstant.YES);
+			}
+			sampleFlowContext.setBusinessSubSampleAnalysisGroupList(curDeptSubSampleAnalysisGroupDOList);
+			
+		}
 	}
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignDataSaveOrUpdateCmp.java

@@ -11,11 +11,17 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataD
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementProjectDataMapper;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleTaskAssignContext;
 import jakarta.annotation.Resource;
 
@@ -36,6 +42,15 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent {
 	
 	@Resource
 	private BusinessQCCoefficientParameterDataMapper  businessQCCoefficientParameterDataMapper;
+	
+	@Resource
+	private BusinessQCManagementDataMapper businessQCManagementDataMapper;
+	
+	@Resource
+	private BusinessQCManagementProjectDataMapper businessQCManagementProjectDataMapper;
+	
+	@Resource
+	private BusinessQCManagementParameterDataMapper businessQCManagementParameterDataMapper;
 
 	@Override
 	public void process() throws Exception {
@@ -53,6 +68,12 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent {
 		
 		List<BusinessQCCoefficientParameterDataDO> businessQCCoefficientParameterDataList = sampleTaskAssignContext.getBusinessQCCoefficientParameterDataList();
 		
+		List<BusinessQCManagementDataDO> businessQCManagementDataDOList = sampleTaskAssignContext.getBusinessQCManagementDataDOList();
+		
+		List<BusinessQCManagementProjectDataDO> businessQCManagementProjectDataDOList = sampleTaskAssignContext.getBusinessQCManagementProjectDataDOList();
+		
+		List<BusinessQCManagementParameterDataDO> businessQCManagementParameterDataDOList = sampleTaskAssignContext.getBusinessQCManagementParameterDataDOList();
+		
 		if (CollUtil.isNotEmpty(savebusinessAssayTaskList)) {
 			this.businessAssayTaskMapper.insertBatch(savebusinessAssayTaskList);
 		}
@@ -76,6 +97,18 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent {
 		if (CollUtil.isNotEmpty(businessQCCoefficientParameterDataList)) {
 			this.businessQCCoefficientParameterDataMapper.insertBatch(businessQCCoefficientParameterDataList);
 		}
+		
+		if (CollUtil.isNotEmpty(businessQCManagementDataDOList)) {
+			this.businessQCManagementDataMapper.insertBatch(businessQCManagementDataDOList);
+		}
+		
+		if (CollUtil.isNotEmpty(businessQCManagementProjectDataDOList)) {
+			this.businessQCManagementProjectDataMapper.insertBatch(businessQCManagementProjectDataDOList);
+		}
+		
+		if (CollUtil.isNotEmpty(businessQCManagementParameterDataDOList)) {
+			this.businessQCManagementParameterDataMapper.insertBatch(businessQCManagementParameterDataDOList);
+		}
 	}
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java

@@ -8,16 +8,30 @@ import org.apache.commons.lang3.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataExtendRespVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementSampleParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementParameterDataMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementProjectDataMapper;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleTaskAssignContext;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectExtendRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodParameterExtendRespVO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodParameterDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectParameterDO;
 import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodMapper;
+import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodParameterMapper;
 import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectMapper;
 import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectParameterMapper;
 import com.zt.plat.module.qms.business.config.dal.mapper.ConfigQCSampleMethodMapper;
@@ -37,6 +51,9 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent {
 	@Resource
 	private ConfigAssayMethodMapper configAssayMethodMapper;
 	
+	@Resource
+	private ConfigAssayMethodParameterMapper configAssayMethodParameterMapper;
+	
 	@Resource
 	private ConfigQCSampleMethodMapper configQCSampleMethodMapper;
 	
@@ -48,6 +65,9 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent {
 	
 	@Resource
 	private ConfigAssayMethodProjectParameterMapper configAssayMethodProjectParameterMapper;
+	
+	@Resource
+	private BusinessAssayProjectDataMapper businessAssayProjectDataMapper;
 		
 	@Resource
 	private BusinessQCCoefficientDataMapper businessQCCoefficientDataMapper;
@@ -55,6 +75,15 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent {
 	@Resource
 	private BusinessQCCoefficientParameterDataMapper businessQCCoefficientParameterDataMapper;
 	
+	@Resource
+	private BusinessQCManagementDataMapper businessQCManagementDataMapper;
+	
+	@Resource
+	private BusinessQCManagementProjectDataMapper businessQCManagementProjectDataMapper;
+	
+	@Resource
+	private BusinessQCManagementParameterDataMapper businessQCManagementParameterDataMapper;
+	
 	@Override
 	public void process() throws Exception {
 		SampleTaskAssignContext sampleTaskAssignContext = this.getContextBean(SampleTaskAssignContext.class);
@@ -62,6 +91,11 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent {
 		List<BusinessQCCoefficientDataDO> businessQCCoefficientDataDOList = new ArrayList<>();
 		List<BusinessQCCoefficientParameterDataDO> businessQCCoefficientParameterDataDOList = new ArrayList<>();
 		
+	    List<BusinessQCManagementDataDO> businessQCManagementDataDOList = new ArrayList<>();
+	    List<BusinessQCManagementSampleParameterDataDO> businessQCManagementSampleParameterDataDOList = new ArrayList<>();
+	    List<BusinessQCManagementProjectDataDO> businessQCManagementProjectDataDOList = new ArrayList<>();
+	    List<BusinessQCManagementParameterDataDO> businessQCManagementParameterDataDOList = new ArrayList<>();
+		
 		//分配任务
 		List<BusinessAssayTaskDO> businessAssayTaskList = new ArrayList<>();
 		//获取需要保存的分配任务
@@ -71,6 +105,9 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent {
 		businessAssayTaskList.addAll(saveBusinessAssayTaskList);
 		businessAssayTaskList.addAll(updateBusinessAssayTaskList);
 		
+		//检测任务
+		List<BusinessAssayTaskDataDO> businessAssayTaskDataList = sampleTaskAssignContext.getBusinessAssayTaskDataList();
+		
 		//获取分配任务的分析方法id列表
 		List<Long> configAssayMethodIdList = businessAssayTaskList.stream().map(m -> m.getConfigAssayMethodId()).distinct().collect(Collectors.toList());
 		
@@ -86,63 +123,177 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent {
 
 		//循环分配任务
 		for (BusinessAssayTaskDO businessAssayTaskDO : businessAssayTaskList) {
-			ConfigQCSampleMethodExtendRespVO configQCSampleMethodExtendRespVO = configQCSampleMethodList.stream().filter(f -> f.getConfigAssayMethodId().equals(businessAssayTaskDO.getConfigAssayMethodId()) && "kby".equals(f.getDictionaryBusinessKey())).findFirst().orElse(null);
+			ConfigQCSampleMethodExtendRespVO configQCSampleMethodExtendRespVO = configQCSampleMethodList.stream().filter(f -> f.getConfigAssayMethodId().equals(businessAssayTaskDO.getConfigAssayMethodId()) && ("kby".equals(f.getDictionaryBusinessKey()) || "zkkby".equals(f.getDictionaryBusinessKey()))).findFirst().orElse(null);
 			//不存在空白样，直接跳出
 			if (configQCSampleMethodExtendRespVO == null) {
-				break;
+				continue;
 			}
 			
 			ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId());
 			
-			//查询下质控数据，如果存在则跳出循环
+			if ("kby".equals(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey())) { //普通空白样
-			List<BusinessQCCoefficientDataDO> businessQCCoefficientDataList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
+
-			//如果存在则跳出循环
+				//查询下质控数据，如果存在则跳出循环
-			if (CollUtil.isNotEmpty(businessQCCoefficientDataList)) {
+				List<BusinessQCCoefficientDataDO> businessQCCoefficientDataList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
-				break;
+				//如果存在则跳出循环
+				if (CollUtil.isNotEmpty(businessQCCoefficientDataList)) {
+					continue;
+				}
+				
+				//根据默认配置的个数生成空白样
+				for (int i = 0; i < configQCSampleMethodExtendRespVO.getDefaultCount(); i++) {
+
+					BusinessQCCoefficientDataDO businessQCCoefficientDataDO = new BusinessQCCoefficientDataDO();
+					businessQCCoefficientDataDO.setId(IdWorker.getId());
+					businessQCCoefficientDataDO.setBusinessAssayTaskId(businessAssayTaskDO.getId());
+					businessQCCoefficientDataDO.setConfigAssayMethodId(configQCSampleMethodExtendRespVO.getConfigAssayMethodId());
+					businessQCCoefficientDataDO.setSampleName(configQCSampleMethodExtendRespVO.getDictionaryBusinessName());
+					if (StringUtils.isNotBlank(configQCSampleMethodExtendRespVO.getCodeRule())) {
+						String codeSample = sequenceUtil.genCode(configQCSampleMethodExtendRespVO.getCodeRule());
+						businessQCCoefficientDataDO.setSampleCode(codeSample);
+					}
+					businessQCCoefficientDataDO.setDictionaryBusinessId(configQCSampleMethodExtendRespVO.getDictionaryBusinessId());
+					businessQCCoefficientDataDO.setDictionaryBusinessKey(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey());
+					businessQCCoefficientDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId());
+					businessQCCoefficientDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName());
+					businessQCCoefficientDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator());
+					businessQCCoefficientDataDO.setAssayOperatorId(businessAssayTaskDO.getAssayOperatorId());
+					businessQCCoefficientDataDO.setAssayProject("");
+					businessQCCoefficientDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime());
+					businessQCCoefficientDataDO.setIsAssignTasked(QmsCommonConstant.YES);
+					businessQCCoefficientDataDO.setIsReported(QmsCommonConstant.NO);
+					
+					businessQCCoefficientDataDOList.add(businessQCCoefficientDataDO);
+					
+					List<ConfigQCSampleMethodParameterExtendRespVO> configQCSampleMethodParameterExtendRespVOs = configQcSampleMethodParameterList.stream().filter(f -> f.getConfigQCSampleMethodId().equals(configQCSampleMethodExtendRespVO.getId())).collect(Collectors.toList());
+					for (ConfigQCSampleMethodParameterExtendRespVO configQCSampleMethodParameterExtendRespVO : configQCSampleMethodParameterExtendRespVOs) {
+						BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterDataDO = new BusinessQCCoefficientParameterDataDO();
+						businessQCCoefficientParameterDataDO.setBusinessQCCoefficientDataId(businessQCCoefficientDataDO.getId());
+						businessQCCoefficientParameterDataDO.setConfigQCSampleMethodParameterId(configQCSampleMethodParameterExtendRespVO.getId());
+						businessQCCoefficientParameterDataDO.setDictionaryParameterId(configQCSampleMethodParameterExtendRespVO.getDictionaryParameterId());
+						businessQCCoefficientParameterDataDO.setDataType(configQCSampleMethodParameterExtendRespVO.getDataType());
+						businessQCCoefficientParameterDataDO.setDecimalPosition(configQCSampleMethodParameterExtendRespVO.getDecimalPosition());
+						businessQCCoefficientParameterDataDO.setValue(configQCSampleMethodParameterExtendRespVO.getDefaultValue());					
+						
+						businessQCCoefficientParameterDataDOList.add(businessQCCoefficientParameterDataDO);
+					}
+				}
+				
+			} else if ("zkkby".equals(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey())) {//质控空白样
+				//查询质控数据，如果存在则跳出循环
+				List<BusinessQCManagementDataDO> businessQCManagementDataList = businessQCManagementDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId());
+				if (CollUtil.isNotEmpty(businessQCManagementDataList)) {
+					continue;
+				}
+				//分析项目
+				List<ConfigAssayMethodProjectExtendRespVO> configAssayMethodProjectExtendRespList = configAssayMethodProjectMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
+				
+				List<Long> businessAssayTaskDataIdList = businessAssayTaskDataList.stream().filter(f -> f.getBusinessAssayTaskId().equals(businessAssayTaskDO.getId())).map(m -> m.getId()).collect(Collectors.toList());
+				List<BusinessAssayProjectDataExtendRespVO> businessAssayProjectDataList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(businessAssayTaskDataIdList);
+				//检测项目id
+				List<Long> dictionaryProjectIdList = new ArrayList<>();
+				//必须要检测的项目
+				String mustProject = configQCSampleMethodExtendRespVO.getMustProject();
+				if (StringUtils.isNotBlank(mustProject)) {
+					String[] mustProjects = mustProject.split(",");
+					for (String dicProjectId : mustProjects) {
+						dictionaryProjectIdList.add(Long.parseLong(dicProjectId));
+					}
+				}
+
+				//获取当前任务的检测项目id列表
+				List<Long> busTaskDictionaryProjectIdList = businessAssayProjectDataList.stream().map(m -> m.getDictionaryProjectId()).distinct().collect(Collectors.toList());
+				dictionaryProjectIdList.addAll(busTaskDictionaryProjectIdList);
+				//获取需要创建的检测项目id
+				List<Long> configAssayMethodProjectIds = configAssayMethodProjectExtendRespList.stream().filter(f -> dictionaryProjectIdList.contains(f.getDictionaryProjectId())).map(m -> m.getId()).collect(Collectors.toList());
+				
+				//分析项目参数
+				List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectByConfigAssayMethodProjectIds(configAssayMethodProjectIds);
+				//分析项目
+				String assayProject = configAssayMethodProjectExtendRespList.stream().map(m -> m.getShowName()).collect(Collectors.joining(","));
+				
+
+				//分析方法参数配置
+				List<ConfigAssayMethodParameterDO> configAssayMethodParameterDOList = configAssayMethodParameterMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
+				
+				for (int i = 0; i < configQCSampleMethodExtendRespVO.getDefaultCount(); i++) {
+					
+					BusinessQCManagementDataDO businessQCManagementDataDO = new BusinessQCManagementDataDO();
+					businessQCManagementDataDO.setId(IdWorker.getId());
+					businessQCManagementDataDO.setBusinessAssayTaskId(businessAssayTaskDO.getId());
+					businessQCManagementDataDO.setConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
+					businessQCManagementDataDO.setSampleName(configQCSampleMethodExtendRespVO.getDictionaryBusinessName());
+					if (StringUtils.isNotBlank(configQCSampleMethodExtendRespVO.getCodeRule())) {
+						String codeSample = sequenceUtil.genCode(configQCSampleMethodExtendRespVO.getCodeRule());
+						businessQCManagementDataDO.setSampleCode(codeSample);
+					}
+					businessQCManagementDataDO.setBusinessStandardSampleId(null);//特殊空白样无定值样
+					businessQCManagementDataDO.setDictionaryBusinessId(configQCSampleMethodExtendRespVO.getDictionaryBusinessId());
+					businessQCManagementDataDO.setDictionaryBusinessKey(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey());
+					businessQCManagementDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId());
+					businessQCManagementDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName());
+					businessQCManagementDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator());
+					businessQCManagementDataDO.setAssayOperatorId(businessAssayTaskDO.getAssayOperatorId());
+					businessQCManagementDataDO.setAssayProject(assayProject);
+					businessQCManagementDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime());
+					businessQCManagementDataDO.setIsAssignTasked(QmsCommonConstant.YES);
+					businessQCManagementDataDO.setIsReported(QmsCommonConstant.NO);
+					
+					businessQCManagementDataDOList.add(businessQCManagementDataDO);
+					
+					BusinessQCManagementSampleParameterDataDO businessQCManagementSampleParameterDataDO = null;
+					for (ConfigAssayMethodParameterDO configAssayMethodParameterDO : configAssayMethodParameterDOList) {
+						businessQCManagementSampleParameterDataDO = new BusinessQCManagementSampleParameterDataDO();
+						businessQCManagementSampleParameterDataDO.setId(IdWorker.getId());
+						businessQCManagementSampleParameterDataDO.setBusinessQCManagementDataId(businessQCManagementDataDO.getId());
+						businessQCManagementSampleParameterDataDO.setConfigAssayMethodParameterId(configAssayMethodParameterDO.getId());
+						businessQCManagementSampleParameterDataDO.setDataType(configAssayMethodParameterDO.getDataType());
+						businessQCManagementSampleParameterDataDO.setDecimalPosition(configAssayMethodParameterDO.getDecimalPosition());						
+						
+						businessQCManagementSampleParameterDataDOList.add(businessQCManagementSampleParameterDataDO);
+					}
+
+					for (ConfigAssayMethodProjectExtendRespVO configAssayMethodProjectExtendRespVO : configAssayMethodProjectExtendRespList) {
+						if (!dictionaryProjectIdList.contains(configAssayMethodProjectExtendRespVO.getDictionaryProjectId())) {//不存在则跳过
+							continue;
+						}
+						BusinessQCManagementProjectDataDO businessQCManagementProjectDataDO = new BusinessQCManagementProjectDataDO();
+						businessQCManagementProjectDataDO.setId(IdWorker.getId());
+						businessQCManagementProjectDataDO.setBusinessQCManagementDataId(businessQCManagementDataDO.getId());
+						businessQCManagementProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectExtendRespVO.getId());
+						businessQCManagementProjectDataDO.setDictionaryProjectId(configAssayMethodProjectExtendRespVO.getDictionaryProjectId());
+						businessQCManagementProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_QUALITY_CONTROL);
+						businessQCManagementProjectDataDO.setSymbol("=");
+						businessQCManagementProjectDataDO.setDataType(configAssayMethodProjectExtendRespVO.getDataType());
+						businessQCManagementProjectDataDO.setDecimalPosition(configAssayMethodProjectExtendRespVO.getDecimalPosition());
+						businessQCManagementProjectDataDO.setIsEnabled(configAssayMethodProjectExtendRespVO.getIsDefaultEnabled());
+						
+						businessQCManagementProjectDataDOList.add(businessQCManagementProjectDataDO);
+						
+						List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDoList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectExtendRespVO.getId())).collect(Collectors.toList());
+						for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDoList) {
+							BusinessQCManagementParameterDataDO businessQCManagementParameterDataDO = new BusinessQCManagementParameterDataDO();
+							businessQCManagementParameterDataDO.setBusinessQCManagementProjectDataId(businessQCManagementProjectDataDO.getId());
+							businessQCManagementParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
+							businessQCManagementParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
+							businessQCManagementParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
+							businessQCManagementParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+							
+							businessQCManagementParameterDataDOList.add(businessQCManagementParameterDataDO);
+						}
+						
+					}
+				}
+				
 			}
 			
-			//根据默认配置的个数生成空白样
-			for (int i = 0; i < configQCSampleMethodExtendRespVO.getDefaultCount(); i++) {
-
-				BusinessQCCoefficientDataDO businessQCCoefficientDataDO = new BusinessQCCoefficientDataDO();
-				businessQCCoefficientDataDO.setId(IdWorker.getId());
-				businessQCCoefficientDataDO.setBusinessAssayTaskId(businessAssayTaskDO.getId());
-				businessQCCoefficientDataDO.setConfigAssayMethodId(configQCSampleMethodExtendRespVO.getConfigAssayMethodId());
-				businessQCCoefficientDataDO.setSampleName(configQCSampleMethodExtendRespVO.getDictionaryBusinessName());
-				if (StringUtils.isNotBlank(configQCSampleMethodExtendRespVO.getCodeRule())) {
-					String codeSample = sequenceUtil.genCode(configQCSampleMethodExtendRespVO.getCodeRule());
-					businessQCCoefficientDataDO.setSampleCode(codeSample);
-				}
-				businessQCCoefficientDataDO.setDictionaryBusinessId(configQCSampleMethodExtendRespVO.getDictionaryBusinessId());
-				businessQCCoefficientDataDO.setDictionaryBusinessKey(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey());
-				businessQCCoefficientDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId());
-				businessQCCoefficientDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName());
-				businessQCCoefficientDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator());
-				businessQCCoefficientDataDO.setAssayOperatorId(businessAssayTaskDO.getAssayOperatorId());
-				businessQCCoefficientDataDO.setAssayProject("");
-				businessQCCoefficientDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime());
-				businessQCCoefficientDataDO.setIsAssignTasked(QmsCommonConstant.YES);
-				businessQCCoefficientDataDO.setIsReported(QmsCommonConstant.NO);
-				
-				businessQCCoefficientDataDOList.add(businessQCCoefficientDataDO);
-				
-				List<ConfigQCSampleMethodParameterExtendRespVO> configQCSampleMethodParameterExtendRespVOs = configQcSampleMethodParameterList.stream().filter(f -> f.getConfigQCSampleMethodId().equals(configQCSampleMethodExtendRespVO.getId())).collect(Collectors.toList());
-				for (ConfigQCSampleMethodParameterExtendRespVO configQCSampleMethodParameterExtendRespVO : configQCSampleMethodParameterExtendRespVOs) {
-					BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterDataDO = new BusinessQCCoefficientParameterDataDO();
-					businessQCCoefficientParameterDataDO.setBusinessQCCoefficientDataId(businessQCCoefficientDataDO.getId());
-					businessQCCoefficientParameterDataDO.setConfigQCSampleMethodParameterId(configQCSampleMethodParameterExtendRespVO.getId());
-					businessQCCoefficientParameterDataDO.setDictionaryParameterId(configQCSampleMethodParameterExtendRespVO.getDictionaryParameterId());
-					businessQCCoefficientParameterDataDO.setDataType(configQCSampleMethodParameterExtendRespVO.getDataType());
-					businessQCCoefficientParameterDataDO.setDecimalPosition(configQCSampleMethodParameterExtendRespVO.getDecimalPosition());
-					businessQCCoefficientParameterDataDO.setValue(configQCSampleMethodParameterExtendRespVO.getDefaultValue());					
-					
-					businessQCCoefficientParameterDataDOList.add(businessQCCoefficientParameterDataDO);
-				}
-			}
 		}
 		sampleTaskAssignContext.setBusinessQCCoefficientDataList(businessQCCoefficientDataDOList);
 		sampleTaskAssignContext.setBusinessQCCoefficientParameterDataList(businessQCCoefficientParameterDataDOList);
 		
+		sampleTaskAssignContext.setBusinessQCManagementDataDOList(businessQCManagementDataDOList);
+		sampleTaskAssignContext.setBusinessQCManagementProjectDataDOList(businessQCManagementProjectDataDOList);
+		sampleTaskAssignContext.setBusinessQCManagementParameterDataDOList(businessQCManagementParameterDataDOList);
 	}
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/slot/SampleTaskAssignContext.java

@@ -10,6 +10,10 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataD
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementSampleParameterDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
 import com.zt.plat.module.qms.business.bus.liteflow.param.AssignAssayUser;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
@@ -89,5 +93,17 @@ public class SampleTaskAssignContext {
     
     /** 质控样-(空白、标准)检测参数数据 **/
     private List<BusinessQCCoefficientParameterDataDO> businessQCCoefficientParameterDataList;
+    
+    /** 质控样-（质控空白） **/
+    private List<BusinessQCManagementDataDO> businessQCManagementDataDOList;
+    
+    /** 质控样-（质控空白）参数 **/
+    private List<BusinessQCManagementSampleParameterDataDO> businessQCManagementSampleParameterDataDOList;
+    
+    /** 质控样-（质控空白）检测项目 **/
+    private List<BusinessQCManagementProjectDataDO> businessQCManagementProjectDataDOList;
+
+    /** 质控样-（质控空白）检测项目参数 **/
+    private List<BusinessQCManagementParameterDataDO> businessQCManagementParameterDataDOList;
 
 }