结果判定修改

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

@@ -116,7 +116,8 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样业务不存在");
 	ErrorCode BUSINESS_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样检测项目业务不存在");
 	
-	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定检测项目数据业务不存在");
+	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
+	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定检测项目数据业务不存在");
 	
 	ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_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

@@ -158,9 +158,30 @@ public interface QmsCommonConstant {
     /** 品质控制 **/
     String ASSAY_PROJECT_USAGE_QUALITY_CONTROL = "quality_control";
     
+    /** 结果判定-初始值 **/
+    String ASMT_INITIAL = "initial";
+    
+    /** 结果判定-待上报 **/
+    String ASMT_PENDING_REPORT = "pending_report";
+    
+    /** 结果判定-待判定 **/
+    String ASMT_PENDING_ASSESSMENT = "pending_assessment";
+    
+    /** 结果判定-复测中 **/
+    String ASMT_RE_INSPECTED = "re_inspected";
+    
+    /** 结果判定-已上报 */
+    String ASMT_REPORTED = "reported";
+
     /** 检验完成状态-完成 **/
     String CHECKED = "checked";
 
     /** 检验完成状态-未完成 **/
     String UNCHECKED = "unchecked";
+    
+    /** 自动 **/
+    String AUTOMATIC = "automatic";
+    
+    /** 手动 **/
+    String MANUAL = "manual";
 }

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

@@ -47,10 +47,8 @@ public class SampleAnalysisAuditController {
 	}
 	
 	@GetMapping("/getSampleResultAssessmentList")
-	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String assessmentStatus) {
-		
-		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, assessmentStatus);
-		
+	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) {
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, asmtReportedStatus);
 		return success(result);
 	}
 	

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

@@ -29,4 +29,10 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
     
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
+
+    private Integer  asmtIsReported;
+
+    private Integer  asmtIsRecheck;
+
+    private String  asmtReportedStatus;
 }

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

@@ -13,4 +13,18 @@ public class BusinessAssayTaskDataGroupRespVO {
 	
 	private Integer sampleTaskCount;
 
+	/** 判定未完 **/
+	private Integer asmtInitialCount;
+	
+	/** 判定待上报 **/
+	private Integer asmtPendingReportCount;
+	
+	/** 判定待判定 **/
+	private Integer asmtPendingAssessmentCount;
+	
+	/** 判定复测 **/
+	private Integer asmtReInspectedCount;
+	
+	/** 判定已上报 **/
+	private Integer asmtReportedCount;
 }

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

@@ -22,6 +22,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "分样子样ID", example = "20464")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", example = "9130")
     private Long configAssayMethodId;
 

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

@@ -22,6 +22,9 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "分样子样ID", example = "20464")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", example = "9130")
     private Long configAssayMethodId;
 
@@ -89,4 +92,9 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "备注")
     private String remark;
     
+    //=== 扩展字段，判定上报状态
+    @Schema(description = "判定上报状态")
+    private String asmtReportedStatus;
+    
+
 }

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

@@ -28,6 +28,9 @@ public class BusinessAssayTaskDataRespVO {
     @ExcelProperty("分样子样ID")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;

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

@@ -26,6 +26,9 @@ public class BusinessAssayTaskDataSaveReqVO {
     @NotNull(message = "分样子样ID不能为空")
     private Long businessSubSampleId;
 
+    @Schema(description = "分样子样判定ID", example = "14560")
+    private Long businessSubSampleAssessmentId;
+
     @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
     @NotNull(message = "检测方法配置ID不能为空")
     private Long configAssayMethodId;