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

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

@@ -3,17 +3,22 @@ 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 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.SampleAnalysisAuditService;
 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;
+
 /**
  * 分析审核
  */
@@ -69,6 +74,18 @@ public class SampleAnalysisAuditController {
 		return success(result);
 	}
 	
+	//修改结果判定
+	@PostMapping("/modifyResultAssessment")
+	public CommonResult<?> modifyResultAssessment(@RequestBody ModifyResultAssessmentReqVO reqVO) {
+		JSONObject result = null;
+		if ("平行".equals(reqVO.getAssayType())) {
+			result = sampleAnalysisAuditService.modifyParallelResultAssessment(reqVO.getSampleId(), reqVO.getConfigAssayMethodId(), reqVO.getSampleAssessmentId(), reqVO.getBusinessAssayProjectDataIds());
+		} else if ("双杯".equals(reqVO.getAssayType())) {
+			
+		}
+		return success(result);
+	}
+	
 	//判定数据上报
 	@PostMapping("/assessmentDataReporting")
 	public CommonResult<?> assessmentDataReporting(Long businessSubSampleId, Long configAssayMethodId) {
@@ -82,4 +99,5 @@ public class SampleAnalysisAuditController {
 		sampleAnalysisAuditService.createReAnalysis(businessSubSampleId, configAssayMethodId);
 		return success("成功"); 
 	}
+	
 }

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

@@ -0,0 +1,19 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class ModifyResultAssessmentReqVO {
+
+	private String assayType;
+	
+	private Long sampleId;
+	
+	private Long configAssayMethodId;
+	
+	private Long sampleAssessmentId;
+	
+	private List<Long> businessAssayProjectDataIds;
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.java

@@ -116,7 +116,8 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayProjectDataExtendRespVO::getSampleAssayCode)
 				.selectAs(BusinessSubSampleDO::getSampleReturnCode, BusinessAssayProjectDataExtendRespVO::getSampleReturnCode)
 				.eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
-				.eqIfPresent(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()));
+				.eqIfPresent(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+				.eqIfPresent(BusinessAssayProjectDataDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId()));
     }
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditService.java

@@ -1,5 +1,7 @@
 package com.zt.plat.module.qms.business.bus.service;
 
+import java.util.List;
+
 import com.alibaba.fastjson2.JSONObject;
 
 /**
@@ -28,4 +30,6 @@ public interface SampleAnalysisAuditService {
 
 	void createReAnalysis(Long businessSubSampleId, Long configAssayMethodId);
 
+	JSONObject modifyParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId, Long businessSubSampleAssessmentId, List<Long> businessAssayProjectDataIds);
+
 }