Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

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

@@ -595,6 +595,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 				businessSubSampleAssessmentDO.setId(IdWorker.getId());	
 				businessSubSampleAssessmentDO.setBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
 				businessSubSampleAssessmentDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+				businessSubSampleAssessmentDO.setBusinessSubParentSampleAssessmentId(businessSubParentSampleAssessmentDO.getId());
 				businessSubSampleAssessmentDO.setBusinessSubSampleId(businessSubSampleDO.getId());
 				businessSubSampleAssessmentDO.setConfigAssayMethodId(configAssayMethodZhy.getId());
 				businessSubSampleAssessmentDO.setAssayType(assayType);
@@ -679,43 +680,33 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 			businessSampleAssayResultMapper.updateBatch(sampleAssayResultList);
 		}
 		if (CollUtil.isNotEmpty(businessBaseSampleDOList)) {
-			log.info("插入 businessBaseSampleDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessBaseSampleMapper.insertBatch(businessBaseSampleDOList);
 		}
 		if (CollUtil.isNotEmpty(businessSubParentSampleDOList)) {
-			log.info("插入 businessSubParentSampleDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessSubParentSampleMapper.insertBatch(businessSubParentSampleDOList);
 		}
 		if (CollUtil.isNotEmpty(businessSubParentSampleAssessmentDOList)) {
-			log.info("插入 businessSubParentSampleAssessmentDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessSubParentSampleAssessmentMapper.insertBatch(businessSubParentSampleAssessmentDOList);
 		}
 		if (CollUtil.isNotEmpty(businessSubSampleDOList)) {
-			log.info("插入 businessSubSampleDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessSubSampleMapper.insertBatch(businessSubSampleDOList);
 		}
 		if (CollUtil.isNotEmpty(businessSubSampleAnalysisGroupDOList)) {
-			log.info("插入 businessSubSampleAnalysisGroupDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessSubSampleAnalysisGroupMapper.insertBatch(businessSubSampleAnalysisGroupDOList);
 		}
 		if (CollUtil.isNotEmpty(businessSubSampleAssessmentDOList)) {
-			log.info("插入 businessSubSampleAssessmentDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessSubSampleAssessmentMapper.insertBatch(businessSubSampleAssessmentDOList);
 		}
 		if (CollUtil.isNotEmpty(businessAssayTaskDataDOList)) {
-			log.info("插入 businessAssayTaskDataDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessAssayTaskDataMapper.insertBatch(businessAssayTaskDataDOList);
 		}		
 		if (CollUtil.isNotEmpty(businessAssayProjectDataDOList)) {
-			log.info("插入 businessAssayProjectDataDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessAssayProjectDataMapper.insertBatch(businessAssayProjectDataDOList);
 		}
 		if (CollUtil.isNotEmpty(businessAssayParameterDataDOList)) {
-			log.info("插入 businessAssayParameterDataDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessAssayParameterDataMapper.insertBatch(businessAssayParameterDataDOList);
 		}
 		if (CollUtil.isNotEmpty(businessAssayReportDataDOList)) {
-			log.info("插入 businessAssayReportDataDOList 前 tenant_id = {}", TenantContextHolder.getTenantId());
 			businessAssayReportDataMapper.insertBatch(businessAssayReportDataDOList);
 		}
 	}

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

@@ -1030,7 +1030,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 				}
 				
 			}
-		}		
+		}
 		businessAssayTaskDO.setIngredientsStatus(QmsCommonConstant.IN_PROGRESS);
 		businessAssayTaskMapper.updateById(businessAssayTaskDO);
 	}