fix: 3.大包终止 剩余收回,企业任务不应被收回.

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

@@ -3068,11 +3068,18 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		// 已分配积分值
 		int assignedScore = 0;
+		// 查询子包的积分
 		List<WmScorePackage> subPackages = this.list(Wrappers.<WmScorePackage>lambdaQuery()
 				.eq(WmScorePackage::getRelationScoreId, packageId)
 				.ne(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.TERMINATED.val()));
 		if (CollUtil.isNotEmpty(subPackages)) {
-			assignedScore = subPackages.stream().mapToInt(WmScorePackage::getScore).sum();
+			assignedScore += subPackages.stream().mapToInt(WmScorePackage::getScore).sum();
+		}
+		// 查询企业任务的积分
+		List<WmTask> entTaskList = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
+				.eq(WmTask::getScorePackageId, packageId));
+		if (CollUtil.isNotEmpty(entTaskList)) {
+			assignedScore += entTaskList.stream().mapToInt(WmTask::getScore).sum();
 		}
 
 		log.info("当前积分包终止前数据:{}", scorePackage);