字段修改等

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

@@ -76,4 +76,10 @@ public class SampleAnalysisAuditController {
 		return success("成功"); 
 	}
 	
+	//重新创建复检委托
+	@PostMapping("/createReAnalysis")
+	public CommonResult<?> createReAnalysis(Long businessSubSampleId, Long configAssayMethodId) {
+		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/BusinessAssayProjectDataExtendRespVO.java

@@ -6,6 +6,18 @@ import lombok.Data;
 @Data
 public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDataRespVO {
 	
+    @Schema(description = "样品主样ID", example = "23293")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品分样ID", example = "15024")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", example = "20464")
+    private Long businessSubSampleId;
+
+    @Schema(description = "任务分配单Id")
+    private Long businessAssayTaskId;
+
     @Schema(description = "样品名称", example = "张三")
     private String sampleName;
 
@@ -32,4 +44,7 @@ public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDa
 
     @Schema(description = "单位")
     private String dictionaryProjectUnit;
+    
+    @Schema(description = "分析次数")
+    private Integer analysisCount;
 }

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

@@ -9,6 +9,9 @@ public class BusinessSubSampleAssessmentExtendRespVO extends BusinessSubSampleAs
     @Schema(description = "检测项目key")
     private String dictionaryProjectKey;
 
+    @Schema(description = "检测项目单位")
+    private String dictionaryProjectUnit;
+    
     @Schema(description = "检测项目缩写")
     private String simpleName;
     

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

@@ -97,6 +97,10 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectDataExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectDataExtendRespVO::getShowName)
 				.selectAs(BusinessAssayTaskDataDO::getAssayOperator, BusinessAssayProjectDataExtendRespVO::getAssayOperator)
+				.selectAs(BusinessAssayTaskDataDO::getAnalysisCount, BusinessAssayProjectDataExtendRespVO::getAnalysisCount)
+				.selectAs(BusinessAssayTaskDataDO::getBusinessBaseSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessBaseSampleId)
+				.selectAs(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubParentSampleId)
+				.selectAs(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessAssayProjectDataExtendRespVO::getBusinessSubSampleId)
 				.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayProjectDataExtendRespVO::getSampleName)
 				.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayProjectDataExtendRespVO::getSampleCode)
 				.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayProjectDataExtendRespVO::getSampleAssayCode)

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

@@ -6,6 +6,7 @@ import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentPageReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
 import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
@@ -46,8 +47,10 @@ public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessS
     
     default List<BusinessSubSampleAssessmentExtendRespVO> selectByBusinessSubSampleIdAndConfigAssayMethodId(Long businessSubSampleId, Long configAssayMethodId) {
     	return selectJoinList(BusinessSubSampleAssessmentExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleAssessmentDO>()
+    			.leftJoin(ConfigAssayMethodProjectDO.class, ConfigAssayMethodProjectDO::getId, BusinessSubSampleAssessmentDO::getConfigAssayMethodProjectId)
     			.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessSubSampleAssessmentDO::getDictionaryProjectId)
     			.selectAll(BusinessSubSampleAssessmentDO.class)
+				.selectAs(ConfigAssayMethodProjectDO::getDictionaryProjectUnit, BusinessSubSampleAssessmentExtendRespVO::getDictionaryProjectUnit)
     			.selectAs(DictionaryProjectDO::getKey, BusinessSubSampleAssessmentExtendRespVO::getDictionaryProjectKey)
 				.selectAs(DictionaryProjectDO::getSimpleName, BusinessSubSampleAssessmentExtendRespVO::getSimpleName)
 				.selectAs(DictionaryProjectDO::getShowName, BusinessSubSampleAssessmentExtendRespVO::getShowName)

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

@@ -26,4 +26,6 @@ public interface SampleAnalysisAuditService {
 
 	void assessmentDataReporting(Long businessSubSampleId, Long configAssayMethodId);
 
+	void createReAnalysis(Long businessSubSampleId, Long configAssayMethodId);
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSamplePageReqVO.java

@@ -38,7 +38,7 @@ public class ConfigSubSamplePageReqVO extends PageParam {
     private Integer isPrint;
 
     @Schema(description = "复检节点")
-    private String recheckFlowCode;
+    private String recheckFlowNodeKey;
 
     @Schema(description = "样品名称", example = "芋艿")
     private String sampleName;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSampleRespVO.java

@@ -50,7 +50,7 @@ public class ConfigSubSampleRespVO {
 
     @Schema(description = "复检节点")
     @ExcelProperty("复检节点")
-    private String recheckFlowCode;
+    private String recheckFlowNodeKey;
 
     @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @ExcelProperty("样品名称")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSampleSaveReqVO.java

@@ -44,7 +44,7 @@ public class ConfigSubSampleSaveReqVO {
     private Integer isPrint;
 
     @Schema(description = "复检节点")
-    private String recheckFlowCode;
+    private String recheckFlowNodeKey;
 
     @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @NotEmpty(message = "样品名称不能为空")