From 645a87f806a53c7cb8218924470ed4f0eadaa8e1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 20 八月 2024 19:14:02 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 65 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index f85d2ea..336e258 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -185,39 +185,38 @@
return AjaxResult.ok(accountingStrategyService.pageList(query));
}
- @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "审核")
- @PostMapping(value = "/auth/pass")
- public AjaxResult<PageInfo<TAccountingStrategyVO>> authPass(@RequestBody SteategyPassDto steategyPassDto) {
- TAccountingStrategy byId = accountingStrategyService.getById(steategyPassDto.getId());
- Long userId = tokenService.getLoginUser().getSysUser().getUserId();
- if (byId.getAuditStatus()==1&&byId.getFirstUserId()!=userId){
- return AjaxResult.error("您不是一级审核人员，无法审核");
- }
- if (byId.getAuditStatus()==2&&byId.getTwoUserId()!=userId){
- return AjaxResult.error("您不是二级审核人员，无法审核");
- }
- if (steategyPassDto.getPass()==1){
- if (byId.getAuditStatus()==1){
-
- byId.setAuditStatus(2);
- byId.setFirstRemark(steategyPassDto.getRemark());
-
- }else if (byId.getAuditStatus()==2){
- byId.setAuditStatus(3);
- byId.setTwoRemark(steategyPassDto.getRemark());
-
- }
- }else {
- byId.setAuditStatus(4);
- }
- return AjaxResult.success();
-
-
-
-
-
-
- }
+// @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "审核")
+// @PostMapping(value = "/auth/pass")
+// public AjaxResult<PageInfo<TAccountingStrategyVO>> authPass(@RequestBody SteategyPassDto steategyPassDto) {
+// TAccountingStrategy byId = accountingStrategyService.getById(steategyPassDto.getId());
+// Long userId = tokenService.getLoginUser().getSysUser().getUserId();
+// if (byId.getAuditStatus()==1&&byId.getFirstUserId()!=userId){
+// return AjaxResult.error("您不是一级审核人员，无法审核");
+// }
+// if (byId.getAuditStatus()==2&&byId.getTwoUserId()!=userId){
+// return AjaxResult.error("您不是二级审核人员，无法审核");
+// }
+// if (steategyPassDto.getPass()==1){
+// if (byId.getAuditStatus()==1){
+//
+// byId.setAuditStatus(2);
+// byId.setFirstRemark(steategyPassDto.getRemark());
+//
+// }else if (byId.getAuditStatus()==2){
+// byId.setAuditStatus(3);
+// byId.setTwoRemark(steategyPassDto.getRemark());
+//
+// }
+// }else {
+// byId.setAuditStatus(4);
+// }
+//
+//
+//
+//
+//
+//
+// }
/**
* 小程序远程调用 根据会员折扣、预付金额 计算服务费
--
Gitblit v1.7.1