From f18b35727a11a5f8b5e326f6045f49b571954ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 六月 2025 11:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 1ab40bb..733c089 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -1766,8 +1766,9 @@
</select>
<select id="getSumDegreeBySiteIds" resultType="java.math.BigDecimal">
- select sum(charging_capacity) from t_charging_order where del_flag=0
- and site_id in
+ select sum(t2.charging_capacity) from t_charging_order t1 left join t_charging_order_summary_data t2
+ on t1.id =t2. charging_order_id where t1.del_flag=0
+ and t1.site_id in
<foreach item="item" index="index" collection="siteIds" open="(" separator="," close=")">
#{item}
</foreach>
--
Gitblit v1.7.1