瀏覽代碼

fix: 查询关联积分包可分配积分,统计时没有去掉已终止的积分包

lixuesong 1 年之前
父節點
當前提交
f7553633fd

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

@@ -3278,7 +3278,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			List<WmScorePackage> subPackages = this.list(Wrappers.<WmScorePackage>lambdaQuery()
 			List<WmScorePackage> subPackages = this.list(Wrappers.<WmScorePackage>lambdaQuery()
 					.in(WmScorePackage::getRelationScoreId, packageIdSet)
 					.in(WmScorePackage::getRelationScoreId, packageIdSet)
 					.eq(WmScorePackage::getDelFlag, DelEnum.NOT_DEL.val())
 					.eq(WmScorePackage::getDelFlag, DelEnum.NOT_DEL.val())
-					.eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val()));
+					.eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
+					.ne(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.TERMINATED.val()));
 			Map<String, Integer> relatedPackageScoresMap = new HashMap<>();
 			Map<String, Integer> relatedPackageScoresMap = new HashMap<>();
 			if (CollUtil.isNotEmpty(subPackages)) {
 			if (CollUtil.isNotEmpty(subPackages)) {
 				// 已分配的积分
 				// 已分配的积分