From 2b8f9da407809fe6bedd85c2465e38426838c948 Mon Sep 17 00:00:00 2001 From: wxr Date: Thu, 25 Dec 2025 10:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=A7=94=E6=89=98=E6=A0=B7?= =?UTF-8?q?=E5=93=81=E7=94=9F=E6=88=90bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entrust/SampleEntrustGenSampleDataCmp.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java index 4a24ea7..1318c2c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java @@ -544,11 +544,16 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { //根据任务数循环 for (int i = 0; i < configSubSampleMethodDO.getTaskCount(); i++) { + Long businessSubSampleId = businessSubSampleDO.getId(); + Long businessSubSampleAssessmentId = businessSubSampleAssessmentDO.getId(); BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> { String assayProject = f.getAssayProject(); if (StringUtils.isNotBlank(assayProject)) { List 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; }).findFirst().orElse(null); @@ -776,11 +781,16 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent { for (int i = 0; i < addAssayTaskConfigSubSampleMethodDO.getTaskCount(); i++) { //根据检测方法循环 + Long businessSubSampleId = businessSubSampleDO.getId(); + Long businessSubSampleAssessmentId = businessSubSampleAssessmentDO.getId(); BusinessAssayTaskDataDO businessAssayTaskDataDO = businessAssayTaskDataDOList.stream().filter(f -> { String assayProject = f.getAssayProject(); if (StringUtils.isNotBlank(assayProject)) { List 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; }).findFirst().orElse(null);