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

上报时添加判定是否已生成委托部门

Browse Source
This commit is contained in:
王兴荣
2026-03-26 14:03:19 +08:00
parent 56eb717371
commit a8ac34bbd9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java
View File

@@ -824,9 +824,9 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
for (BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistrationDO : businessSampleEntrustRegistrationDOList) { for (BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistrationDO : businessSampleEntrustRegistrationDOList) {
ConfigEntrustSourceDO configEntrustSourceDO = configEntrustSourceMapper.selectById(businessSampleEntrustRegistrationDO.getConfigEntrustSourceId()); ConfigEntrustSourceDO configEntrustSourceDO = configEntrustSourceMapper.selectById(businessSampleEntrustRegistrationDO.getConfigEntrustSourceId());
if (QmsCommonConstant.YES.equals(configEntrustSourceDO.getIsGenerateDocument())) {//需要生成部门编制报告 //过滤当前委托下的分析部门
//过滤当前委托下的分析部门 List<BusinessSampleEntrustDepartmentDO> currBusinessSampleEntrustDepartmentDOList = allBusinessSampleEntrustDepartmentDOList.stream().filter(f -> f.getBusinessSampleEntrustRegistrationId().equals(businessSampleEntrustRegistrationDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList());
List<BusinessSampleEntrustDepartmentDO> 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) { for (BusinessSampleEntrustDepartmentDO businessSampleEntrustDepartmentDO : currBusinessSampleEntrustDepartmentDOList) {
//过滤当前分析部门下的样品 //过滤当前分析部门下的样品
List<BusinessSampleEntrustDepartmentDetailDO> currBusinessSampleEntrustDepartmentDetailDOList = allBusinessSampleEntrustDepartmentDetailDOList.stream().filter(f -> f.getBusinessSampleEntrustDepartmentId().equals(businessSampleEntrustDepartmentDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList()); List<BusinessSampleEntrustDepartmentDetailDO> currBusinessSampleEntrustDepartmentDetailDOList = allBusinessSampleEntrustDepartmentDetailDOList.stream().filter(f -> f.getBusinessSampleEntrustDepartmentId().equals(businessSampleEntrustDepartmentDO.getId()) && !QmsCommonConstant.CHECKED.equals(f.getAssayStatus())).collect(Collectors.toList());