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

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

@@ -77,6 +77,9 @@ public interface ErrorCodeConstants {
 	ErrorCode DICTIONARY_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目字典不存在");
 	ErrorCode DICTIONARY_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品类型字典不存在");
 	
+	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, "质控与定值样关系不存在");
+	
 	/*=================================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, "委检登记样品明细不存在");
@@ -107,6 +110,10 @@ public interface ErrorCodeConstants {
 	
 	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
 
+	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 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-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

@@ -145,4 +145,7 @@ public interface QmsCommonConstant {
     
     /** 配料和报出 **/
     String ASSAY_PROJECT_USAGE_INGREDIENT_REPORT = "ingredient_report";
+    
+    /** 品质控制 **/
+    String ASSAY_PROJECT_USAGE_QUALITY_CONTROL = "quality_control";
 }

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

@@ -80,9 +80,9 @@ public class BusinessAssayTaskController implements BusinessControllerMarker {
     @Operation(summary = "获得检测任务分配业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
-    public CommonResult<BusinessAssayTaskRespVO> getBusinessAssayTask(@RequestParam("id") Long id) {
-        BusinessAssayTaskDO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id);
-        return success(BeanUtils.toBean(businessAssayTask, BusinessAssayTaskRespVO.class));
+    public CommonResult<BusinessAssayTaskExtendRespVO> getBusinessAssayTask(@RequestParam("id") Long id) {
+    	BusinessAssayTaskExtendRespVO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id);
+        return success(businessAssayTask);
     }
 
     @GetMapping("/page")

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

@@ -49,7 +49,7 @@ public class SampleTaskAssignController {
 	public CommonResult<?> getAssayMethodList(Long businessSubSampleId, Long configAssayMethodId) {
 		List<Object> list = sampleTaskAssignService.getAssayMethodList(businessSubSampleId, configAssayMethodId);
 		return success(list);
-	} 
+	}
 
     @PostMapping("/changeMethod")
     public CommonResult<?> changeMethod(@RequestBody ChangeAssayMethodReqVO req) {
@@ -80,6 +80,12 @@ public class SampleTaskAssignController {
     	sampleTaskAssignService.removeAssignTaskDetail(req);
     	return success("成功");
     }
+
+	@PostMapping("/createQcSample")
+	public CommonResult<?> createQcSample(@RequestBody CreateQcSampleReqVO req) {
+		sampleTaskAssignService.createQcSample(req);
+		return success("成功");
+	}
     
     @PostMapping("/submitAssign")
     public CommonResult<?> submitAssign(Long id) {

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

@@ -1,5 +1,9 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.util.List;
+
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
+
 import lombok.Data;
 
 /**
@@ -20,6 +24,12 @@ public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
 	/** 分析方法名称 **/
     private String configAssayMethodName;
     
+    /** 分析方法对应的分析项目 **/
+    private String configAssayMethodProjectShowNames;
+    
     /** 分析任务数 **/
     private Long assayTaskCount;
+    
+    /** 质量控制分析方法 **/
+    private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
 }

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

@@ -0,0 +1,8 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessQCDataExtendRespVO extends BusinessQCDataRespVO {
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCDataPageReqVO.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 BusinessQCDataPageReqVO extends PageParam {
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "样品名称", example = "赵六")
+    private String sampleName;
+
+    @Schema(description = "检测方法配置ID", example = "8003")
+    private Long configAssayMethodId;
+
+    @Schema(description = "指派单ID", example = "29117")
+    private Long businessAssayTaskId;
+
+    @Schema(description = "定值样业务ID", example = "24895")
+    private Long businessStandardSampleId;
+
+    @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549")
+    private Long dictionaryBusinessId;
+
+    @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
+    private String dictionaryBusinessKey;
+
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "分析部门ID", example = "29365")
+    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 = "24118")
+    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;
+
+}