Pārlūkot izejas kodu

fix: 财务复核功能-结算状态问题

lixuesong 1 gadu atpakaļ
vecāks
revīzija
ee8bbdd91e

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SettleStatusEnum.java

@@ -19,7 +19,7 @@ public enum SettleStatusEnum {
 	SETTLE_STATUS_NO("4", "未结算", ""),
 	SETTLE_STATUS_PART("5", "部分成功", ""),
 	SETTLE_STATUS_WAIT("9", "待结算", "申请结算"),
-	TO_BE_REVIEWED("10", "复核不通过", "复核不通过"),
+	REVIEW_NOT_PASSED("10", "复核不通过", "复核不通过"),
 	SETTLE_STATUS_NULL("", "", "");
 
 	private String val;

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

@@ -883,7 +883,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		if (UpmsState.SettleFinancialReviewStatus.REJECTED.equals(input.getReviewStatus())) {
 			WmScorePackage scorePackage = new WmScorePackage();
 			scorePackage.setId(input.getId());
-			scorePackage.setSettleStatus(Integer.valueOf(SettleStatusEnum.TO_BE_REVIEWED.getVal()));
+			scorePackage.setSettleStatus(Integer.valueOf(SettleStatusEnum.REVIEW_NOT_PASSED.getVal()));
 			scorePackage.setUpdateUser(operator.getId());
 			scorePackage.setUpdateTime(now);
 			wmScorePackageService.updateById(scorePackage);
@@ -939,14 +939,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			}).collect(Collectors.toSet());
 			noteService.updateBatchById(updateNotes);
 
-			// 修改积分包状态为待结算
-			WmScorePackage scorePackage = new WmScorePackage();
-			scorePackage.setId(input.getId());
-			scorePackage.setSettleStatus(Integer.valueOf(SettleStatusEnum.SETTLE_STATUS_WAIT.getVal()));
-			scorePackage.setUpdateUser(operator.getId());
-			scorePackage.setUpdateTime(now);
-			wmScorePackageService.updateById(scorePackage);
-
 			return Boolean.FALSE;
 		}
 	}