shc 8 miesięcy temu
rodzic
commit
f3d986ec99

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackaeServiceImpl.java

@@ -732,7 +732,8 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
             // 获取子集包
             List<WmScorePackage> wmScorePackages = wmScorePackageMapper.selectList(Wrappers.<WmScorePackage>lambdaQuery().in(WmScorePackage::getRelationScoreId, pkgIds));
-            Set<Integer> collect2 = wmScorePackages.stream().map(WmScorePackage::getId).map(Integer::valueOf).collect(Collectors.toSet());
+            // 6 表示已经中止的积分包
+            Set<Integer> collect2 = wmScorePackages.stream().filter(pkg -> !"6".equals(pkg.getScorePackageStatus())).map(WmScorePackage::getId).map(Integer::valueOf).collect(Collectors.toSet());
             Map<Integer, List<WmPackageTaskTypeQty>> collect3 = packageTaskTypeQtyService.listPkgTaskTypeQtyByPkgIds(collect2).stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getTaskTypeId));