From 2dcafd2c7302af2b4e7b240d98ef2ab4522e770b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:43:37 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 0c6cab6..c6e22fc 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
@@ -90,7 +90,7 @@
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理", "管理后台-充电桩信息"},value = "查询计费策略明细列表")
@GetMapping(value = "/queryAccountingStrategyDetailByStrategyId")
public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam("strategyId") Integer strategyId) {
- List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
+ List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryMangementAccountingStrategyDetailByStrategyId(strategyId);
list.forEach(detail -> {
detail.setTotalPrice(detail.getElectrovalence().add(detail.getServiceCharge()));
});
@@ -191,7 +191,10 @@
dto.setAuditStatus(1);
accountingStrategyService.updateById(dto);
// 添加明细
- dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
+ dto.getAccountingStrategyDetails().forEach(detail -> {
+ detail.setAccountingStrategyId(dto.getId());
+ detail.setId(null);
+ });
accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
}
@@ -363,11 +366,16 @@
TAccountingStrategy one = accountingStrategyService.lambdaQuery().eq(TAccountingStrategy::getId, byId.getParentId()).one();
byId.setSiteId(one.getSiteId());
//将site表对应的模板id修改为新的这个
- Site byId1 = siteService.getById(one.getSiteId());
- if (byId1!=null) {
- byId1.setAccountingStrategyId(byId.getId());
- siteService.updateById(byId1);
+ List<Site> list = siteService.lambdaQuery().eq(Site::getAccountingStrategyId, one.getId()).list();
+ for (Site site : list) {
+ site.setAccountingStrategyId(byId.getId());
}
+ siteService.updateBatchById(list);
+ //
+
+
+
+ //
accountingStrategyService.removeById(one.getId());
}
//硬件
--
Gitblit v1.7.1