fix: 结算报告审批-复审取score值

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

@@ -454,7 +454,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				.eq(WmScorePackageStatus::getStatus, PackageStatusEnum.APPROVED.val())
 				.eq(WmScorePackageStatus::getPackageId, taskScorePackageId));
 		if (CollUtil.isNotEmpty(packageStatusList)) {
-			String taskAddFlagStr = totalTaskScore >= reportScorePackage.getScore() ? "0" : "1";
+			String taskAddFlagStr = totalTaskScore >= taskScorePackage.getScore() ? "0" : "1";
 			// 修改领包记录状态
 			packageStatusList.forEach(packageStatus -> {
 				LambdaUpdateWrapper<WmScorePackageStatus> updateStatusWrapper = Wrappers.<WmScorePackageStatus>lambdaUpdate()
@@ -476,9 +476,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		// STEP4: 更新积分包状态
 		if ("2".equals(approvalOpinion)) {
 			// 审核不通过，则释放积分值，从而直接可以重新做任务
-			String scorePackageStatus = totalTaskScore >= reportScorePackage.getScore() ?
+			String scorePackageStatus = totalTaskScore >= taskScorePackage.getScore() ?
 					ScorePackageStatusEnum.TO_BE_SETTLED.val() : ScorePackageStatusEnum.IN_PROGRESS.val();
-			String taskAddFlagStr = totalTaskScore >= reportScorePackage.getScore() ? "0" : "1";
+			String taskAddFlagStr = totalTaskScore >= taskScorePackage.getScore() ? "0" : "1";
 			// 更新积分包
 			log.info("scorePackage更新参数：条件id={},updateTime={},updateUser={},更新项scorePackageStatus={},taskAddFlag={},updateTime={},updateUser={}",
 					taskScorePackageId, taskScorePackage.getUpdateTime(), taskScorePackage.getUpdateUser(), scorePackageStatus, taskAddFlagStr, now, operatorId);
@@ -502,9 +502,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 					.and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1")
 							.or().eq(WmTask::getReportOneApprovalOpinion, "1")));
 			int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
-			String scorePackageStatus = totalScore >= reportScorePackage.getScore() ?
+			String scorePackageStatus = totalScore >= taskScorePackage.getScore() ?
 					ScorePackageStatusEnum.TO_BE_SETTLED.val() : ScorePackageStatusEnum.IN_PROGRESS.val();
-			String taskAddFlagStr = totalScore >= reportScorePackage.getScore() ? "0" : "1";
+			String taskAddFlagStr = totalScore >= taskScorePackage.getScore() ? "0" : "1";
 			// 更新积分包
 			log.info("scorePackage更新参数：条件id={},updateTime={},updateUser={},更新项scorePackageStatus={},taskAddFlag={},updateTime={},updateUser={}",
 					taskScorePackageId, taskScorePackage.getUpdateTime(), taskScorePackage.getUpdateUser(), scorePackageStatus, taskAddFlagStr, now, operatorId);