From 2b34a6c13d7b66e886e9be26f6f5c27ee0dba74f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 17:45:34 +0800
Subject: [PATCH] 修改首页
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
index 4ad86d4..d71e666 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
@@ -147,13 +147,13 @@
select
a.accounting_strategy_id,
(a.electrovalence+a.service_charge) AS electrovalence,
- ((a.electrovalence+a.service_charge)*a.discount) AS vipElectrovalence
+ ((a.electrovalence+a.service_charge)*b.discount) AS vipElectrovalence
from
t_accounting_strategy_detail a
left join
t_accounting_strategy b on (a.accounting_strategy_id = b.id)
where b.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
- AND DATE_FORMAT(NOW(), '%H:%i:%s') between b.start_time and b.end_time) tasd on (ts.accounting_strategy_id = tasd.accounting_strategy_id)
+ AND DATE_FORMAT(NOW(), '%H:%i:%s') between a.start_time and a.end_time) tasd on (ts.accounting_strategy_id = tasd.accounting_strategy_id)
<where>
<if test="null != query.name and '' != query.name">
and ts.`name` like CONCAT('%', #{query.name}, '%')
--
Gitblit v1.7.1