From de09da99330cf51bdab4934dae143a6cc72014d6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 26 十月 2024 11:26:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
index 89d4819..3bd8ac6 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
@@ -114,13 +114,13 @@
public R<TAccountingStrategyDetail> getDetailByCode(@RequestParam("code") String code){
// 查询桩
TChargingPile chargingPile = chargingPileService.getOne(Wrappers.lambdaQuery(TChargingPile.class)
- .eq(TChargingPile::getCode,code)
+ .eq(TChargingPile::getCode,code).eq(TChargingPile::getDelFlag, 0)
.last("LIMIT 1"));
if(Objects.isNull(chargingPile)){
return R.fail("未查询到该桩设备");
}
TChargingGun chargingGun = chargingGunService.getOne(Wrappers.lambdaQuery(TChargingGun.class)
- .eq(TChargingGun::getChargingPileId, chargingPile.getId())
+ .eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0)
.last("LIMIT 1"));
TAccountingStrategy accountingStrategy = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
TAccountingStrategyDetail one;
@@ -146,7 +146,7 @@
public R<Boolean> checkChargingStrategy(@RequestBody CheckChargingStrategyDTO dto){
// 查询桩
TChargingPile chargingPile = chargingPileService.getOne(Wrappers.lambdaQuery(TChargingPile.class)
- .eq(TChargingPile::getCode,dto.getCode())
+ .eq(TChargingPile::getCode,dto.getCode()).eq(TChargingPile::getDelFlag, 0)
.last("LIMIT 1"));
if(Objects.isNull(chargingPile)){
return R.ok(false);
@@ -180,13 +180,13 @@
public R<List<TAccountingStrategyDetail>> getDetailListByCode(@RequestParam("code") String code){
// 查询桩
TChargingPile chargingPile = chargingPileService.getOne(Wrappers.lambdaQuery(TChargingPile.class)
- .eq(TChargingPile::getCode,code)
+ .eq(TChargingPile::getCode,code).eq(TChargingPile::getDelFlag, 0)
.last("LIMIT 1"));
if(Objects.isNull(chargingPile)){
return R.fail("未查询到该桩设备");
}
TChargingGun chargingGun = chargingGunService.getOne(Wrappers.lambdaQuery(TChargingGun.class)
- .eq(TChargingGun::getChargingPileId, chargingPile.getId())
+ .eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0)
.last("LIMIT 1"));
TAccountingStrategy accountingStrategy = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
if(Objects.nonNull(accountingStrategy)){
--
Gitblit v1.7.1