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

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

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

@@ -79,9 +79,10 @@ public interface ErrorCodeConstants {
 	
 	ErrorCode CONFIG_QC_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样与检测方法配置不存在");
 	ErrorCode CONFIG_QC_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控与定值样关系不存在");
+	ErrorCode CONFIG_QC_SAMPLE_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样检测方法参数配置不存在");
 	ErrorCode CONFIG_PERMISSION_NOT_EXISTS = new ErrorCode(1_032_050_000, "权限配置不存在");
 	ErrorCode CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS = new ErrorCode(1_032_050_000, "存放位置不存在");
-	
+
 	/*=================================bus 检验业务  1_032_100_000 ~ 1_032_149_999==================================*/
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_REGISTRATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记样品明细不存在");
@@ -115,7 +116,14 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_QC_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样业务不存在");
 	ErrorCode BUSINESS_QC_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
 	ErrorCode BUSINESS_QC_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
-	
+
+	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_COEFFICIENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数任务数据,空白样、标样不存在");
+	ErrorCode BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数参数业务不存在");
+
+
 	//检测报告
 	ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
 	ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");

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

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -39,6 +39,12 @@ public class SampleAnalysisController {
 		return success("成功");
 	}
 	
+	@GetMapping("/batchSampleAndQcAnalysisByTaskId")
+	public CommonResult<?> batchSampleAndQcAnalysisByTaskId(Long businessAssayTaskId) {
+		BusinessAssayTaskAnalysisSampleAndQcProjectRespVO businessAssayTaskAnalysisSampleAndQcProject = sampleAnalysisService.batchSampleAndQcAnalysisByTaskId(businessAssayTaskId);
+		return success(businessAssayTaskAnalysisSampleAndQcProject);
+	}
+	
 	
 	@PostMapping("/submitSampleAnalysisByTaskId")
 	public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) {

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

@@ -0,0 +1,56 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import com.zt.plat.module.qms.business.config.controller.vo.*;
+
+import lombok.Data;
+
+/**
+ * 分配任务单 分析样品及质控样品检测项目
+ */
+@Data
+public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
+
+	/** 分配任务单id **/
+    private Long businessAssayTaskId;
+
+    /** 任务分配单编号 **/
+    private String businessAssayTasNo;
+
+    /** 任务分配单名称 **/
+    private String businessAssayTasName;
+    
+    /** 分析人员 **/
+    private String assayOperator;
+    
+    /** 分析时间 **/
+    private LocalDateTime assayTime;
+
+    /** 检测方法id **/
+    private Long configAssayMethodId;
+    
+    /** 检测方法名称 **/
+    private String configAssayMethodName;
+    
+    /** 数据集key **/
+    private String dataCollectionKey;
+    
+    /** 数据集id **/
+    private Long dataCollectionId;
+    
+    /** 动态表单值 **/
+    private String formValue;
+    
+    /** 分配任务的分析数据 **/
+    private List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList;
+
+    /** 检测方法分析项目补正系数 **/
+    private List<ConfigAssayMethodProjectCoefficientRespVO> configAssayMethodProjectCoefficientList;
+    
+    /** 检测方法范围 **/
+    private List<ConfigAssayMethodProjectRangeRespVO> configAssayMethodProjectRangeList;
+    
+    
+}

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

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectCoefficientRespVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO;
 import lombok.Data;
 
@@ -48,6 +49,9 @@ public class BusinessAssayTaskAnalysisSampleProjectRespVO {
     
     /** 分析的数据 **/
     private List<Map<String, Object>> datas;
+
+    /** 检测方法分析项目补正系数 **/
+    private List<ConfigAssayMethodProjectCoefficientRespVO> configAssayMethodProjectCoefficientList;
     
     /** 检测方法范围 **/
     private List<ConfigAssayMethodProjectRangeRespVO> configAssayMethodProjectRangeList;

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

@@ -0,0 +1,79 @@
+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 BusinessQCCoefficientDataPageReqVO extends PageParam {
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "样品名称", example = "赵六")
+    private String sampleName;
+
+    @Schema(description = "检测方法配置ID", example = "31198")
+    private Long configAssayMethodId;
+
+    @Schema(description = "指派单ID", example = "28147")
+    private Long businessAssayTaskId;
+
+    @Schema(description = "定值样业务ID", example = "5300")
+    private Long businessStandardSampleId;
+
+    @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "21660")
+    private Long dictionaryBusinessId;
+
+    @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
+    private String dictionaryBusinessKey;
+
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", example = "12186")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称", example = "芋艿")
+    private String assayDepartmentName;
+
+    @Schema(description = "分析人")
+    private String assayOperator;
+
+    @Schema(description = "分配任务时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] assignTaskTime;
+
+    @Schema(description = "是否已分配任务")
+    private Integer isAssignTasked;
+
+    @Schema(description = "是否已上报")
+    private Integer isReported;
+
+    @Schema(description = "上报人")
+    private String reporter;
+
+    @Schema(description = "上报时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] reportTime;
+
+    @Schema(description = "乐观锁", example = "6160")
+    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;
+
+}