结果报送初步成功

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,73 @@
+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("成功");
+	}
+
+}

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/BusinessSubSampleAssessmentExtendRespVO.java

@@ -6,6 +6,10 @@ import lombok.Data;
 @Data
 public class BusinessSubSampleAssessmentExtendRespVO extends BusinessSubSampleAssessmentRespVO {
 
+	/** 分析方法名称 **/
+    @Schema(description = "分析方法名称")
+    private String configAssayMethodName;
+
     @Schema(description = "检测项目key")
     private String dictionaryProjectKey;
 

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

@@ -13,6 +13,9 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
 
+	@Schema(description = "分样id")
+    private Long businessSubParentSampleId;
+	
     @Schema(description = "分样子样ID", example = "7025")
     private Long businessSubSampleId;
 

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

@@ -15,6 +15,9 @@ public class BusinessSubSampleAssessmentRespVO {
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23478")
     @ExcelProperty("ID")
     private Long id;
+    
+	@Schema(description = "分样id")
+    private Long businessSubParentSampleId;
 
     @Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7025")
     @ExcelProperty("分样子样ID")