From a8ac34bbd9ce5aa49b4b2d3f91c441f66e8a143e Mon Sep 17 00:00:00 2001 From: wxr Date: Thu, 26 Mar 2026 14:03:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=97=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E6=98=AF=E5=90=A6=E5=B7=B2=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=A7=94=E6=89=98=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/service/SampleResultReportingServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java index 8720d312..b8e882bd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java @@ -824,9 +824,9 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe for (BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistrationDO : businessSampleEntrustRegistrationDOList) { ConfigEntrustSourceDO configEntrustSourceDO = configEntrustSourceMapper.selectById(businessSampleEntrustRegistrationDO.getConfigEntrustSourceId()); - if (QmsCommonConstant.YES.equals(configEntrustSourceDO.getIsGenerateDocument())) {//需要生成部门编制报告 - //过滤当前委托下的分析部门 - List currBusinessSampleEntrustDepartmentDOList = allBusinessSampleEntrustDepartmentDOList.stream().filter(f -> f.getBusinessSampleEntrustRegistrationId().equals(businessSampleEntrustRegistrationDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList()); + //过滤当前委托下的分析部门 + List currBusinessSampleEntrustDepartmentDOList = allBusinessSampleEntrustDepartmentDOList.stream().filter(f -> f.getBusinessSampleEntrustRegistrationId().equals(businessSampleEntrustRegistrationDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList()); + if (QmsCommonConstant.YES.equals(configEntrustSourceDO.getIsGenerateDocument()) && CollUtil.isNotEmpty(currBusinessSampleEntrustDepartmentDOList)) {//需要生成部门编制报告,并且当前委托部门不为空 for (BusinessSampleEntrustDepartmentDO businessSampleEntrustDepartmentDO : currBusinessSampleEntrustDepartmentDOList) { //过滤当前分析部门下的样品 List currBusinessSampleEntrustDepartmentDetailDOList = allBusinessSampleEntrustDepartmentDetailDOList.stream().filter(f -> f.getBusinessSampleEntrustDepartmentId().equals(businessSampleEntrustDepartmentDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList());