From f04bb37f47ff1eb51e5e8c42d73514c1e9c33710 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 20 八月 2024 17:22:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 53fee20..beba41a 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.TAccountingStrategyQuery;
@@ -15,13 +16,16 @@
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.domain.BaseDelete;
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;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -30,6 +34,7 @@
import java.math.BigInteger;
import java.math.RoundingMode;
import java.time.LocalTime;
+import java.util.Arrays;
import java.util.List;
/**
@@ -51,7 +56,8 @@
private TChargingPileService chargingPileService;
@Autowired
private ISiteService siteService;
-
+ @Autowired
+ private SysUserClient sysUserClient;
@Resource
private TokenService tokenService;
@@ -120,8 +126,16 @@
*/
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "查看计费策略详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TAccountingStrategy> getDetailById(@RequestParam("id") Integer id) {
- return AjaxResult.ok(accountingStrategyService.getById(id));
+ public AjaxResult<TAccountingStrategyVO> getDetailById(@RequestParam("id") Integer id) {
+ TAccountingStrategy accountingStrategy = accountingStrategyService.getById(id);
+ TAccountingStrategyVO accountingStrategyVO = new TAccountingStrategyVO();
+ BeanUtils.copyProperties(accountingStrategy,accountingStrategyVO);
+ // 查询用户信息
+ String firstUserName = sysUserClient.getSysUser(accountingStrategy.getFirstUserId()).getData().getNickName();
+ String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
+ accountingStrategyVO.setFirstUserName(firstUserName);
+ accountingStrategyVO.setTwoUserName(twoUserName);
+ return AjaxResult.ok(accountingStrategyVO);
}
/**
@@ -143,11 +157,12 @@
@Log(title = "批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
@DeleteMapping(value = "/deleteByIds")
- public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
+ public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
+ String[] split = ids.split(",");
// 刪除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
- .in(TAccountingStrategyDetail::getAccountingStrategyId, ids));
- return AjaxResult.ok(accountingStrategyService.removeByIds(ids));
+ .in(TAccountingStrategyDetail::getAccountingStrategyId, Arrays.asList(split)));
+ return AjaxResult.success(accountingStrategyService.removeByIds(Arrays.asList(split)));
}
@@ -162,7 +177,7 @@
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "查询计费审核分页列表")
@PostMapping(value = "/auth/pageList")
- public AjaxResult authPageList(@RequestBody TAccountingStrategyQuery query) {
+ public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
Long userid = tokenService.getLoginUser().getUserid();
Page<TAccountingStrategy> page = accountingStrategyService.lambdaQuery()
.in(TAccountingStrategy::getFirstUserId, userid)
--
Gitblit v1.7.1