From 7e383cd9001f48141449c2f4e7e007348217f4f8 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 31 十月 2024 16:11:14 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 aaf608f..984a48e 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
@@ -327,7 +327,7 @@
@PostMapping(value = "/auth/pageList")
public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
- return AjaxResult.ok(accountingStrategyService.pageList(query));
+ return AjaxResult.ok(accountingStrategyService.pageList1(query));
}
@@ -360,9 +360,17 @@
TAccountingStrategy one = accountingStrategyService.lambdaQuery().eq(TAccountingStrategy::getId, byId.getParentId()).one();
byId.setSiteId(one.getSiteId());
//将site表对应的模板id修改为新的这个
- Site byId1 = siteService.getById(one.getSiteId());
- 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());
}
//硬件
List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, byId.getSiteId()).list();
@@ -377,6 +385,7 @@
}else if (byId.getAuditStatus()==2){
byId.setTwoRemark(steategyPassDto.getRemark());
+ byId.setTwoAuditTime(LocalDateTime.now());
}
byId.setAuditStatus(4);
--
Gitblit v1.7.1