Merge branch 'feat-20220615-stoppackage' of googol/YY_BE_2 into master

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

@@ -1007,7 +1007,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 								.equals("5")) {//定额
 							int sum;
 							if (wmScorePackage.getRelationScoreId() == null) {
-								sum = taskList1.stream().mapToInt(WmTask::getScore).sum();
+								// 审核不通过的不计入
+								sum = taskList1.stream()
+										.filter(task1 -> !"4".equals(task1.getTaskStatus()))
+										.mapToInt(WmTask::getScore)
+										.sum();
 								res = Integer.parseInt(wmScorePackageStatus.getUserScore()) - sum;
 								if (res > 0) {//个人积分包值大于任务积分值
 									wmScorePackageStatus.setUserScore(sum + "");