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

# Conflicts:
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

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

@@ -191,4 +191,7 @@ public interface QmsCommonConstant {
     String SAMPLE_STORAGE_OPERATION_TYPE_TRANSFER = "dispatch";
     String SAMPLE_STORAGE_OPERATION_TYPE_TAKEN_OFF = "take_off";
 
+
+    /** 允许提交 **/
+    String ALLOW_SUBMIT = "allow_submit";
 }

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

@@ -0,0 +1,12 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class BusinessAssayParameterDataExtendRespVO extends BusinessAssayParameterDataRespVO {
+	
+	private String parameterName;
+	
+	private String parameterKey;
+
+}

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

@@ -17,6 +17,9 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
 	/** 分析方法名称 **/
     @Schema(description = "分析方法名称")
 	private String configAssayMethodName;
+    
+    @Schema(description = "子样配置id")
+    private Long configSubSampleId;
 
     @Schema(description = "样品名称")
     private String sampleName;

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

@@ -83,5 +83,14 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX<BusinessAs
     	return selectList(new LambdaQueryWrapperX<BusinessAssayParameterDataDO>()
     			.in(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, businessAssayProjectDataIds));
     }
+    
+    default List<BusinessAssayParameterDataExtendRespVO> selectExtendByBusinessAssayProjectDataIds(List<Long> businessAssayProjectDataIds) {
+    	return selectJoinList(BusinessAssayParameterDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayParameterDataDO>()
+    			.leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, BusinessAssayParameterDataDO::getDictionaryParameterId)
+    			.selectAll(BusinessAssayParameterDataDO.class)
+    			.selectAs(DictionaryParameterDO::getName, BusinessAssayParameterDataExtendRespVO::getParameterName)
+    			.selectAs(DictionaryParameterDO::getKey, BusinessAssayParameterDataExtendRespVO::getParameterKey)
+    			.in(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, businessAssayProjectDataIds));
+    }
 
 }

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

@@ -47,6 +47,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
         		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
         		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId)
                 .eqIfPresent(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
                 .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
@@ -84,6 +85,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
         		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
         		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId)
                 .eqIfPresent(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
                 .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())

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

@@ -0,0 +1,18 @@
+package com.zt.plat.module.qms.business.config.controller.vo;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class ConfigSubSampleMethodConfInfo {
+
+	/** 分析方法参数取值配置 **/
+	private List<ConfigSubSampleMethodConfItem> getParam;
+	
+	/** 分析方法下发配料配置 **/
+	private List<ConfigSubSampleMethodConfItem> downIngredients;
+	
+	/** 分析方法配料上传配置 **/
+	private List<ConfigSubSampleMethodConfItem> upIngredients;
+}

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

@@ -0,0 +1,16 @@
+package com.zt.plat.module.qms.business.config.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class ConfigSubSampleMethodConfItem {
+
+	/** 来源 **/
+	private ConfigSubSampleMethodConfPoint source;
+	
+	/** 目标 **/
+	private ConfigSubSampleMethodConfPoint target;
+	
+	/** 是否必须 **/
+	private Boolean required;
+}

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

@@ -0,0 +1,20 @@
+package com.zt.plat.module.qms.business.config.controller.vo;
+
+import lombok.Data;
+
+@Data
+public class ConfigSubSampleMethodConfPoint {
+	
+	/** 分析方法id **/
+	private Long methodId;
+	
+	/** 检测项目 **/
+	private String project;
+	
+	/** 参数 **/
+	private String parameter;
+	
+	/** 字段 **/
+	private String field;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSubSampleMethodMapper.java

@@ -53,5 +53,11 @@ public interface ConfigSubSampleMethodMapper extends BaseMapperX<ConfigSubSample
     			.eq(ConfigSubSampleMethodDO::getConfigSubSampleId, configSubSampleId)
     			.eq(ConfigSubSampleMethodDO::getConfigAssayMethodId, configAssayMethodId));
     }
+    
+    default List<ConfigSubSampleMethodDO> selectByConfigSubSampleIdsAndConfigAssayMethodId(List<Long> configSubSampleIds, Long configAssayMethodId) {
+    	return selectList(new LambdaQueryWrapper<ConfigSubSampleMethodDO>()
+    			.in(ConfigSubSampleMethodDO::getConfigSubSampleId, configSubSampleIds)
+    			.eq(ConfigSubSampleMethodDO::getConfigAssayMethodId, configAssayMethodId));
+    }
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/admin/AutoIngredientsController.java

@@ -46,7 +46,7 @@ public class AutoIngredientsController {
 	@PostMapping("/submit-assay-result")
 	@Operation(summary = "检测结果同步")
 	public CommonResult<?> submitAssayResult(@RequestBody AutoIngredientsTaskAssayResultReqVO body) {
-		System.out.println(com.alibaba.fastjson2.JSON.toJSONString(body));
+//		System.out.println(com.alibaba.fastjson2.JSON.toJSONString(body));
 		autoIngredientsService.submitAssayResult(body);
 		return CommonResult.success("成功");
 	}