From 7bb22a32cf85b16dee6ac6acb6b1e0e241ab89f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 17:04:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 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 b321149..58e94fb 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;
@@ -22,6 +23,8 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,8 +36,12 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
+import java.time.LocalDateTime;
import java.time.LocalTime;
+import java.util.Arrays;
import java.util.List;
+
+import static com.ruoyi.common.core.context.SecurityContextHolder.getUserId;
/**
* <p>
@@ -44,7 +51,7 @@
* @author xiaochen
* @since 2024-08-06
*/
-@Api(tags = "计费策略")
+
@RestController
@RequestMapping("/t-accounting-strategy")
public class TAccountingStrategyController {
@@ -95,6 +102,15 @@
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "添加计费策略")
@PostMapping(value = "/add")
public AjaxResult<Integer> add(@RequestBody TAccountingStrategyDTO dto) {
+ if(null != dto.getSiteId()){
+ dto.setAuditStatus(3);
+ }
+ Boolean flag = accountingStrategyDetailService.isStrategy24Hour(dto.getAccountingStrategyDetails());
+ if(flag){
+ return AjaxResult.error("计费模板时间设置有误差");
+ }
+ Long userId = SecurityUtils.getLoginUser().getUserid();
+ dto.setUserId(userId);
accountingStrategyService.save(dto);
// 添加明细
dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
@@ -110,6 +126,10 @@
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TAccountingStrategyDTO dto) {
+ Boolean flag = accountingStrategyDetailService.isStrategy24Hour(dto.getAccountingStrategyDetails());
+ if(flag){
+ return AjaxResult.error("计费模板时间设置有误差");
+ }
// 删除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
.eq(TAccountingStrategyDetail::getAccountingStrategyId, dto.getId()));
@@ -130,10 +150,14 @@
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);
+ if(null != accountingStrategy.getFirstUserId()){
+ String firstUserName = sysUserClient.getSysUser(accountingStrategy.getFirstUserId()).getData().getNickName();
+ accountingStrategyVO.setFirstUserName(firstUserName);
+ }
+ if(null != accountingStrategy.getTwoUserId()){
+ String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
+ accountingStrategyVO.setTwoUserName(twoUserName);
+ }
return AjaxResult.ok(accountingStrategyVO);
}
@@ -156,11 +180,12 @@
@Log(title = "批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
@DeleteMapping(value = "/deleteByIds")
- public AjaxResult<Boolean> deleteByIds(@RequestBody BaseDelete baseDelete) {
+ public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
+ String[] split = ids.split(",");
// 刪除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
- .in(TAccountingStrategyDetail::getAccountingStrategyId, baseDelete.getIds()));
- return AjaxResult.success(accountingStrategyService.removeByIds(baseDelete.getIds()));
+ .in(TAccountingStrategyDetail::getAccountingStrategyId, Arrays.asList(split)));
+ return AjaxResult.success(accountingStrategyService.removeByIds(Arrays.asList(split)));
}
@@ -175,26 +200,58 @@
@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 = SecurityUtils.getLoginUser().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());
+ byId.setFirstAuditTime(LocalDateTime.now());
+
+ }else if (byId.getAuditStatus()==2){
+ byId.setAuditStatus(3);
+ byId.setTwoRemark(steategyPassDto.getRemark());
+ byId.setTwoAuditTime(LocalDateTime.now());
+ }
+ }else {
+ byId.setAuditStatus(4);
+ }
+ accountingStrategyService.updateById(byId);
+
+ return AjaxResult.success();
+
+
+
+
+ }
+
+
+ @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "删除")
+ @DeleteMapping(value = "/delete")
+ public R delete(String ids) {
+ String[] split = ids.split(",");
+ for (String s : split) {
+ accountingStrategyService.removeById(s);
+ }
+ return R.ok();
+
+ }
+
/**
* 小程序远程调用 根据会员折扣、预付金额 计算服务费
* @return
--
Gitblit v1.7.1