From 112a9f935d02d548b869183479532e3921c17d0a Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 11 Feb 2026 16:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=A3=80=E7=BB=BC=E5=90=88=E6=A0=B7?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E7=9A=84=EF=BC=8C=E5=88=99=E4=B8=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/service/SampleAnalysisServiceImpl.java | 15 ++++++++++++--- .../thirdpartyapi/service/XRFDataServiceImpl.java | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java index 7397f10d..c5ab2615 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java @@ -1320,7 +1320,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { //查询当前分析方法下对应的任务 List targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessBaseSampleIdsAndMethodKey(businessBaseSampleIdList, methodKey); List targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); - List targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + List targetBusinessAssayProjectDataExtendList = new ArrayList<>(); + if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) {//如果当前分析下存在任务 + targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + } for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) { ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource(); @@ -1348,7 +1351,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { //查询当前分析方法下对应的任务 List targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey); List targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); - List targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + List targetBusinessAssayProjectDataExtendList = new ArrayList<>(); + if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) { + targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + } for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) { ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource(); @@ -1376,7 +1382,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { //查询当前分析方法下对应的任务 List targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey); List targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); - List targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + List targetBusinessAssayProjectDataExtendList = new ArrayList<>(); + if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) { + targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + } for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) { ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource(); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java index 3c9045e2..e4a228e6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java @@ -390,7 +390,10 @@ public class XRFDataServiceImpl implements XRFDataService { //查询当前分析方法下对应的任务 List targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessBaseSampleIdsAndMethodKey(businessBaseSampleIdList, methodKey); List targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); - List targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + List targetBusinessAssayProjectDataExtendList = new ArrayList<>(); + if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) { + targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + } for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) { ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource(); @@ -418,7 +421,10 @@ public class XRFDataServiceImpl implements XRFDataService { //查询当前分析方法下对应的任务 List targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey); List targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); - List targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + List targetBusinessAssayProjectDataExtendList = new ArrayList<>(); + if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) { + targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + } for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) { ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource(); @@ -446,7 +452,10 @@ public class XRFDataServiceImpl implements XRFDataService { //查询当前分析方法下对应的任务 List targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey); List targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); - List targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + List targetBusinessAssayProjectDataExtendList = new ArrayList<>() ; + if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) { + targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList); + } for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) { ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();