From d171a948a49799c38de7b9f338f67d3f2b1e3175 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 20 八月 2024 18:05:32 +0800
Subject: [PATCH] 8.21
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/TAccountingStrategyQuery.java | 3 +
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/SteategyPassDto.java | 14 +++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 49 +++++++++++++++++-------
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml | 3 +
4 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/TAccountingStrategyQuery.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/TAccountingStrategyQuery.java
index bd7fd41..80ffa4d 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/TAccountingStrategyQuery.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/query/TAccountingStrategyQuery.java
@@ -11,5 +11,8 @@
@ApiModelProperty(value = "计费策略名称")
private String name;
+ @ApiModelProperty(value = "1=待审核一级，2=待审核二级，3=审核通过，4=驳回")
+ private Integer auditStatus;
+
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/SteategyPassDto.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/SteategyPassDto.java
new file mode 100644
index 0000000..0f1a80b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/SteategyPassDto.java
@@ -0,0 +1,14 @@
+package com.ruoyi.common.core.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SteategyPassDto {
+ @ApiModelProperty("备注")
+ private String remark;
+ @ApiModelProperty("1通过2拒绝")
+ private Integer pass;
+ @ApiModelProperty("ID")
+ private Integer id;
+}
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 beba41a..6995865 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
@@ -15,6 +15,7 @@
import com.ruoyi.chargingPile.service.TAccountingStrategyService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.SteategyPassDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BaseDelete;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -45,7 +46,7 @@
* @author xiaochen
* @since 2024-08-06
*/
-@Api(tags = "计费策略")
+
@RestController
@RequestMapping("/t-accounting-strategy")
public class TAccountingStrategyController {
@@ -178,23 +179,43 @@
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "查询计费审核分页列表")
@PostMapping(value = "/auth/pageList")
public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
- Long userid = tokenService.getLoginUser().getUserid();
- Page<TAccountingStrategy> page = accountingStrategyService.lambdaQuery()
- .in(TAccountingStrategy::getFirstUserId, userid)
- .or().in(TAccountingStrategy::getTwoUserId, userid)
- .page(Page.of(query.getPageCurr(), query.getPageSize()));
- List<TAccountingStrategy> records = page.getRecords();
- for (TAccountingStrategy record : records) {
- if (record.getAuditStatus()==2){
- if (record.getFirstUserId().equals(userid)){
- record.setAuditStatus(3);
- }
+
+
+ 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.ok(accountingStrategyService.pageList(query));
+
+
+
+
+
+
}
/**
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
index cb53cae..73bd07c 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TAccountingStrategyMapper.xml
@@ -32,6 +32,9 @@
<if test="query.name != null and query.name != ''">
AND `name` LIKE concat('%',#{query.name}, '%')
</if>
+ <if test="query.auditStatus != null">
+ AND audit_status = #{query.auditStatus}
+ </if>
AND site_id IS NULL
AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
</where>
--
Gitblit v1.7.1