From f47d695f19bca1e58ddedcc10f8d3dff7d7f8f1d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 11:39:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 80 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 23 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..4021ecd 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;
@@ -14,14 +15,18 @@
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;
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 +35,7 @@
import java.math.BigInteger;
import java.math.RoundingMode;
import java.time.LocalTime;
+import java.util.Arrays;
import java.util.List;
/**
@@ -40,7 +46,7 @@
* @author xiaochen
* @since 2024-08-06
*/
-@Api(tags = "计费策略")
+
@RestController
@RequestMapping("/t-accounting-strategy")
public class TAccountingStrategyController {
@@ -51,7 +57,8 @@
private TChargingPileService chargingPileService;
@Autowired
private ISiteService siteService;
-
+ @Autowired
+ private SysUserClient sysUserClient;
@Resource
private TokenService tokenService;
@@ -120,8 +127,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 +158,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,26 +178,44 @@
@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()));
+ public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
- 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
--
Gitblit v1.7.1