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/vo/BusinessAssayProjectDataReqVO.java

@@ -65,4 +65,8 @@ public class BusinessAssayProjectDataReqVO {
     @Schema(description = "备注")
     private String remark;
 
+    //========================扩展字段==================================
+    
+    @Schema(description = "检测任务ID列表", example = "16505")
+    private List<Long> businessAssayTaskDataIdList;
 }

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

@@ -49,6 +49,7 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
 				.selectAs(ConfigAssayMethodProjectDO::getDictionaryBusinessKey, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessKey)
 				.selectAs(DictionaryBusinessDO::getName, BusinessAssayProjectAndParameterRespVO::getGroupDictionaryBusinessName)
                 .eqIfPresent(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
+                .inIfPresent(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataIdList())
                 .eqIfPresent(BusinessAssayProjectDataDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
                 .eqIfPresent(BusinessAssayProjectDataDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
                 .eqIfPresent(BusinessAssayProjectDataDO::getUsage, reqVO.getUsage())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java

@@ -580,7 +580,17 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 				
 				//根据任务数判断是平行还是
 				String assayType = configSubSampleMethodDO.getTaskCount() > 1 ? QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL : QmsCommonConstant.ASSAY_TYPE_SINGLE_CUP;
+				
+				//分样判定数据
+				BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessmentDO = new BusinessSubParentSampleAssessmentDO();
+				businessSubParentSampleAssessmentDO.setId(IdWorker.getId());
+				businessSubParentSampleAssessmentDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+				businessSubParentSampleAssessmentDO.setConfigAssayMethodId(configAssayMethodZhy.getId());
+				businessSubParentSampleAssessmentDO.setAssayType(assayType);
+				businessSubParentSampleAssessmentDO.setTaskType("常规");
+				businessSubParentSampleAssessmentDOList.add(businessSubParentSampleAssessmentDO);
 
+				//子样判定数据
 				BusinessSubSampleAssessmentDO businessSubSampleAssessmentDO = new BusinessSubSampleAssessmentDO();
 				businessSubSampleAssessmentDO.setId(IdWorker.getId());	
 				businessSubSampleAssessmentDO.setBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());