feat(service): 新增结算报告审批不通过释放积分（记得配置字典值-积分包状态）

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

@@ -254,12 +254,13 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 					totalTaskScore += wmtask.getScore();
 				}
 				WmScorePackage updateScorePackage = new WmScorePackage();
+				updateScorePackage.setId(task.getScorePackageId());
 				if (totalTaskScore >= scorePackage.getScore()) {
-					updateScorePackage.setPackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val());
+					updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val());
 					updateScorePackage.setTaskAddFlag("0");
 					updateScorePackageStatus.setTaskAddFlag("0");
 				}else {
-					updateScorePackage.setPackageStatus(ScorePackageStatusEnum.IN_PROGRESS.val());
+					updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.IN_PROGRESS.val());
 					updateScorePackage.setTaskAddFlag("1");
 					updateScorePackageStatus.setTaskAddFlag("1");
 				}
@@ -268,21 +269,24 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			});
 		} else if ("1".equals(approvalOpinion)) {
 			// 审核通过，则判断企业审核通过积分值是否达到积分包的预设值
-			Wrapper<WmTask> apporvalWrapper = Wrappers.<WmTask>lambdaQuery()
-					.eq(WmTask::getScorePackageId, scorePackage.getId())
-					.eq(WmTask::getTaskStatus, TaskStatusEnum.APPROVED.val())
-					.and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1")
-							.or().eq(WmTask::getReportOneApprovalOpinion, "1"));
-			List<WmTask> approvalTaskList = wmTaskService.list(apporvalWrapper);
-			int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
-			if (totalScore >= scorePackage.getScore()) {
-				WmScorePackage updateScorePackage = new WmScorePackage();
+			wmTaskList.forEach(task -> {
+				Wrapper<WmTask> apporvalWrapper = Wrappers.<WmTask>lambdaQuery()
+						.eq(WmTask::getScorePackageId, task.getScorePackageId())
+						.eq(WmTask::getTaskStatus, TaskStatusEnum.APPROVED.val())
+						.and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1")
+								.or().eq(WmTask::getReportOneApprovalOpinion, "1"));
+				List<WmTask> approvalTaskList = wmTaskService.list(apporvalWrapper);
+				int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
 				if (totalScore >= scorePackage.getScore()) {
-					updateScorePackage.setPackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
-					updateScorePackage.setTaskAddFlag("0");
+					WmScorePackage updateScorePackage = new WmScorePackage();
+					updateScorePackage.setId(task.getScorePackageId());
+					if (totalScore >= scorePackage.getScore()) {
+						updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
+						updateScorePackage.setTaskAddFlag("0");
+					}
+					wmScorePackageService.updateById(updateScorePackage);
 				}
-				wmScorePackageService.updateById(updateScorePackage);
-			}
+			});
 		}
 
 		return R.ok("审批成功");