超差判定等再修改

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

@@ -187,6 +187,15 @@ public interface QmsCommonConstant {
     
     /** 结果判定-已上报 */
     String ASMT_REPORTED = "reported";
+    
+    /** 超差判断类型：内控 **/
+    String ASMT_TYPE_INTERNAL_CONTROL = "internalControl";
+
+    /** 超差判断类型：重复性 **/
+    String ASMT_TYPE_REPETITIVENESS = "repetitiveness";
+
+    /** 超差判断类型：再现性 **/
+    String ASMT_TYPE_REPRODUCIBILITY = "reproducibility";
 
     /** 检验完成状态-完成 **/
     String CHECKED = "checked";

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

@@ -104,8 +104,8 @@ public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	//重新创建复检委托
 	@PostMapping("/createReAnalysis")
-	public CommonResult<?> createReAnalysis(Long businessSubSampleId, Long configAssayMethodId, Integer retestCount) {
+	public CommonResult<?> createReAnalysis(Long businessSubSampleId, Long configAssayMethodId, Integer retestCount, Integer taskCount) {
-		sampleAnalysisAuditService.createReAnalysis(businessSubSampleId, configAssayMethodId, retestCount);
+		sampleAnalysisAuditService.createReAnalysis(businessSubSampleId, configAssayMethodId, retestCount, taskCount);
 		return success("成功"); 
 	}
 	

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

@@ -53,4 +53,7 @@ public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDa
 
     @Schema(description = "复测次数")
     private Integer retestCount;
+    
+    @Schema(description = "判定类型名称")
+    private String assessmentTypeName;
 }

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

@@ -57,6 +57,12 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
     @Schema(description = "方法检出下限值")
     private String minimumLimitValue;
 
+    @Schema(description = "判定类型,内控超差、重复性超差、再现性超差", example = "2")
+    private String assessmentType;
+
+    @Schema(description = "是否作废(取消)判定[超差时],1-是，0-否")
+    private Integer isCancelAssessment;
+
     @Schema(description = "是否启用")
     private Integer isEnabled;
 

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

@@ -63,6 +63,12 @@ public class BusinessAssayProjectDataReqVO {
     @Schema(description = "方法检出下限值")
     private String minimumLimitValue;
 
+    @Schema(description = "判定类型,内控超差、重复性超差、再现性超差", example = "2")
+    private String assessmentType;
+
+    @Schema(description = "是否作废(取消)判定[超差时],1-是，0-否")
+    private Integer isCancelAssessment;
+
     @Schema(description = "是否启用")
     private Integer isEnabled;
 

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

@@ -2,9 +2,6 @@ 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.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
@@ -67,6 +64,12 @@ public class BusinessAssayProjectDataRespVO {
     @Schema(description = "方法检出下限值")
     private String minimumLimitValue;
 
+    @Schema(description = "判定类型,内控超差、重复性超差、再现性超差", example = "2")
+    private String assessmentType;
+
+    @Schema(description = "是否作废(取消)判定[超差时],1-是，0-否")
+    private Integer isCancelAssessment;
+
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否启用")
     private Integer isEnabled;

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

@@ -55,6 +55,12 @@ public class BusinessAssayProjectDataSaveReqVO {
     @Schema(description = "方法检出下限值")
     private String minimumLimitValue;
 
+    @Schema(description = "判定类型,内控超差、重复性超差、再现性超差", example = "2")
+    private String assessmentType;
+
+    @Schema(description = "是否作废(取消)判定[超差时],1-是，0-否")
+    private Integer isCancelAssessment;
+
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "是否启用不能为空")
     private Integer isEnabled;

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

@@ -50,6 +50,9 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] reportTime;
 
+    @Schema(description = "上报描述")
+    private String reportDescription;
+
     @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
     private String resultTreatmentWay;
 

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

@@ -62,6 +62,9 @@ public class BusinessSubSampleAssessmentRespVO {
     @ExcelProperty("上报时间")
     private LocalDateTime reportTime;
 
+    @Schema(description = "上报描述")
+    private String reportDescription;
+
     @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
     private String resultTreatmentWay;
 

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

@@ -53,6 +53,9 @@ public class BusinessSubSampleAssessmentSaveReqVO {
     @Schema(description = "上报时间")
     private LocalDateTime reportTime;
 
+    @Schema(description = "上报描述")
+    private String reportDescription;
+
     @Schema(description = "结果处理方式,automatic-自动报出(不超差)，manual-手动报出，modify-允许修改")
     private String resultTreatmentWay;