zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
FCL
2025-12-25 11:10:01 +08:00
parent 363185faed 2b8f9da407
commit 71bb44e053
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,11 +544,16 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
//根据任务数循环 //根据任务数循环
for (int i = 0; i < configSubSampleMethodDO.getTaskCount(); i++) { for (int i = 0; i < configSubSampleMethodDO.getTaskCount(); i++) {
Long businessSubSampleId = businessSubSampleDO.getId();
Long businessSubSampleAssessmentId = businessSubSampleAssessmentDO.getId();
BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> { BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> {
String assayProject = f.getAssayProject(); String assayProject = f.getAssayProject();
if (StringUtils.isNotBlank(assayProject)) { if (StringUtils.isNotBlank(assayProject)) {
List<String> assayProjectList = Arrays.asList(assayProject.split(",")); List<String> assayProjectList = Arrays.asList(assayProject.split(","));
return !assayProjectList.containsAll(dictionaryProjectShowNameList);//分析项目未完全存在，则返回 return !assayProjectList.containsAll(dictionaryProjectShowNameList)
&& configAssayMethodId.equals(f.getConfigAssayMethodId())
&& businessSubSampleId.equals(f.getBusinessSubSampleId())
&& businessSubSampleAssessmentId.equals(f.getBusinessSubSampleAssessmentId()) ;//分析项目未完全存在，则返回
} }
return false; return false;
}).findFirst().orElse(null); }).findFirst().orElse(null);
@@ -776,11 +781,16 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
for (int i = 0; i < addAssayTaskConfigSubSampleMethodDO.getTaskCount(); i++) { for (int i = 0; i < addAssayTaskConfigSubSampleMethodDO.getTaskCount(); i++) {
//根据检测方法循环 //根据检测方法循环
Long businessSubSampleId = businessSubSampleDO.getId();
Long businessSubSampleAssessmentId = businessSubSampleAssessmentDO.getId();
BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> { BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> {
String assayProject = f.getAssayProject(); String assayProject = f.getAssayProject();
if (StringUtils.isNotBlank(assayProject)) { if (StringUtils.isNotBlank(assayProject)) {
List<String> assayProjectList = Arrays.asList(assayProject.split(",")); List<String> assayProjectList = Arrays.asList(assayProject.split(","));
return !assayProjectList.containsAll(dictionaryProjectShowNameList);//分析项目未完全存在，则返回 return !assayProjectList.containsAll(dictionaryProjectShowNameList)
&& addAssayTaskConfigAssayMethod.getId().equals(f.getConfigAssayMethodId())
&& businessSubSampleId.equals(f.getBusinessSubSampleId())
&& businessSubSampleAssessmentId.equals(f.getBusinessSubSampleAssessmentId()) ;//分析项目未完全存在，则返回
} }
return false; return false;
}).findFirst().orElse(null); }).findFirst().orElse(null);