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

@@ -46,6 +46,7 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样检测项目配置不存在");
 	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_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样配置不存在");
 	ErrorCode CONFIG_SAMPLE_REPORT_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品报表关系不存在");
@@ -103,6 +104,8 @@ public interface ErrorCodeConstants {
 	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_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
 
 	//检测报告
 	ErrorCode REPORT_DOCUMENT_MAIN_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/SampleAnalysisAuditController.java

@@ -18,9 +18,6 @@ import jakarta.annotation.Resource;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 分析审核
  */

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

@@ -0,0 +1,87 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import org.springframework.validation.annotation.Validated;
+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.JSONObject;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.service.SampleResultReportingService;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 结果上报
+ */
+@Tag(name = "管理后台 - 结果上报")
+@RestController
+@RequestMapping("/qms/bus/sample/result-reporting")
+@Validated
+public class SampleResultReportingController {
+	
+	@Resource
+	private SampleResultReportingService sampleResultReportingService;
+	
+	//获取未上报的方法
+	@GetMapping("/getUnReportMethodGroupList")
+	public CommonResult<?> getUnReportMethodGroupList() {
+		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList();
+		return success(list);
+	}
+	
+	//获取方法对应的样品
+	@GetMapping("/getSampleResultReportingList")
+	public CommonResult<?> getSampleResultReportingList(Long configAssayMethodId) {
+		JSONObject result = sampleResultReportingService.getSampleResultReportingList(configAssayMethodId);
+		return success(result);
+	}
+	
+	//获取复检方法
+	@GetMapping("/getRecheckAssayMethodList")
+	public CommonResult<?> getRecheckMethodList(Long baseSampleId, Long businessSubParentSampleId, Long configAssayMethodId) {
+		List<RecheckSubSampleParentMethodRespVO> list = sampleResultReportingService.getRecheckAssayMethodList(baseSampleId, businessSubParentSampleId, configAssayMethodId);
+		return success(list);
+	}
+	
+	//创建复检样
+	@PostMapping("/createRecheckSample")
+	public CommonResult<?> createRecheckSample(@RequestBody RecheckSubSampleParentCreateReqVO reqVO) {
+		sampleResultReportingService.createRecheckSample(reqVO);
+		
+		return success("成功");
+	}
+	
+	//上报
+	@PostMapping("/batchResultDataReporting")
+	public CommonResult<?> batchResultDataReporting(@RequestBody BatchResultDataReportingReqVO reqVO) {
+		sampleResultReportingService.batchResultDataReporting(reqVO);
+		return success("成功");
+	}
+	
+	//结果单个结果查询
+	@GetMapping("/getSingleSampleResultReportingList")
+	public CommonResult<?> getSingleSampleResultReportingList(Long businessSubParentSampleId, Long configAssayMethodId) {
+		JSONObject result = sampleResultReportingService.getSingleSampleResultReportingList(businessSubParentSampleId, configAssayMethodId);
+	    return success(result);
+	}
+	
+	//修改结果
+	@PostMapping("/modifySampleResultReporting")
+	public CommonResult<?> modifySampleResultReporting(@RequestBody ModifySampleResultReportingReqVO reqVO) {
+		sampleResultReportingService.modifySampleResultReporting(reqVO);
+		return success("成功");
+	}
+
+}

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

@@ -0,0 +1,13 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class BatchResultDataReportingReqVO {
+	
+	private List<Long> businessSubParentSampleIds;
+	
+	private Long configAssayMethodId;
+}

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

@@ -2,18 +2,6 @@ package com.zt.plat.module.qms.business.bus.controller.vo;
 
 import lombok.Data;
 
-/**
- * <b>BusinessAssayTaskDataGroupRespVO</b>
- * <p>
- * 更新历史：
- * <pre> 版本         更新时间            更新者        更新内容<hr/>
- * V1.0      2025年9月20日          wxr         Add</pre>
- * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
- * </p>
- * @author 王兴荣<wxr@wangxingrong.com>
- * @version V1.0 
- * @since 2025年9月20日
- */
 @Data
 public class BusinessAssayTaskDataGroupRespVO {
 	

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

@@ -0,0 +1,20 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSubParentSampleAssessmentExtendRespVO extends BusinessSubParentSampleAssessmentRespVO {
+
+    @Schema(description = "检测项目key")
+    private String dictionaryProjectKey;
+
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+    
+    @Schema(description = "检测项目缩写")
+    private String simpleName;
+    
+    @Schema(description = "显示名称")
+    private String showName;
+}

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

@@ -0,0 +1,13 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessSubParentSampleAssessmentGroupRespVO {
+
+	private Long configAssayMethodId;
+	
+	private String configAssayMethodName;
+
+	private Integer sampleCount;
+}

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

@@ -25,6 +25,12 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
     @Schema(description = "检测方法配置ID", example = "16271")
     private Long configAssayMethodId;
 
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    private String assayType;
+
     @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
     private String dataType;
 
@@ -34,9 +40,6 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
     @Schema(description = "判定值")
     private String assessmentValue;
 
-    @Schema(description = "上报对应列", example = "张三")
-    private String columnName;
-
     @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", example = "2")
     private String assessmentStatus;
 

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

@@ -32,6 +32,12 @@ public class BusinessSubParentSampleAssessmentRespVO {
     @ExcelProperty("检测方法配置ID")
     private Long configAssayMethodId;
 
+    @Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
+    private String taskType;
+
+    @Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "1")
+    private String assayType;
+
     @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;
@@ -44,10 +50,6 @@ public class BusinessSubParentSampleAssessmentRespVO {
     @ExcelProperty("判定值")
     private String assessmentValue;
 
-    @Schema(description = "上报对应列", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @ExcelProperty("上报对应列")
-    private String columnName;
-
     @Schema(description = "判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("判定状态，in_progress-进行中 normal-正常，exceeds_tolerance-超差")
     private String assessmentStatus;