From 2bae01db4eab159eb004ebf1e2d7fa3ae40fbeb9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 八月 2024 11:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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 e09a570..d028f09 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO;
import com.ruoyi.chargingPile.api.model.TAccountingStrategy;
import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
@@ -14,6 +15,7 @@
import com.ruoyi.chargingPile.service.TAccountingStrategyService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
@@ -22,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -39,6 +42,9 @@
private final TAccountingStrategyService accountingStrategyService;
private final TAccountingStrategyDetailService accountingStrategyDetailService;
+
+ @Resource
+ private TokenService tokenService;
@Autowired
public TAccountingStrategyController(TAccountingStrategyService accountingStrategyService, TAccountingStrategyDetailService accountingStrategyDetailService) {
@@ -142,5 +148,32 @@
List<TAccountingStrategyVO> list = accountingStrategyService.getPlatformAccountingStrategy();
return AjaxResult.success(list);
}
+
+
+
+ @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "查询计费审核分页列表")
+ @PostMapping(value = "/auth/pageList")
+ public AjaxResult 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));
+ }
+
}
--
Gitblit v1.7.1