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

Compare commits

base: zgty:58f9c9a350a648e510bee6afd52d24bf7d8f732f
Branches Tags
zgty:test zgty:lims_dev
..
compare: zgty:635c30f850c9505a8d3183c60a28ebdbda25e4e4
Branches Tags
zgty:test zgty:lims_dev

2 Commits
58f9c9a350 ... 635c30f850

Author SHA1 Message Date
wxr
635c30f850 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-12-25 15:12:26 +08:00
wxr
69a3f75f89 结果报送，上报bug修复 2025-12-25 15:12:17 +08:00
1 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

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

@@ -706,8 +706,8 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
List<Long> noAllReportBusinessSubParentSampleIdList = businessSubParentSampleAssessmentExtendList.stream().filter(f -> "in_progress".equals(f.getAssessmentStatus())).map(m -> m.getBusinessSubParentSampleId()).distinct().collect(Collectors.toList()); List<Long> noAllReportBusinessSubParentSampleIdList = businessSubParentSampleAssessmentExtendList.stream().filter(f -> "in_progress".equals(f.getAssessmentStatus())).map(m -> m.getBusinessSubParentSampleId()).distinct().collect(Collectors.toList());
//全部上报的 //全部上报的
List<Long> allReportBusinessSubParentSampleIdList = new ArrayList<>(); List<Long> allReportBusinessSubParentSampleIdList = new ArrayList<>();
if (noAllReportBusinessSubParentSampleIdList.size() > 0) { if (noAllReportBusinessSubParentSampleIdList != null) {
reqVO.getBusinessSubParentSampleIds().stream().filter(item -> noAllReportBusinessSubParentSampleIdList.contains(item)).collect(Collectors.toList()); allReportBusinessSubParentSampleIdList = reqVO.getBusinessSubParentSampleIds().stream().filter(item -> !noAllReportBusinessSubParentSampleIdList.contains(item)).collect(Collectors.toList());
} }
businessSubParentSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper<BusinessSubParentSampleAssessmentProjectDO>() businessSubParentSampleAssessmentProjectMapper.update(new LambdaUpdateWrapper<BusinessSubParentSampleAssessmentProjectDO>()