From 8e52b4f7d125f715c4cec639a88fee42c47bad22 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 04 十一月 2024 11:24:19 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 6 +++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 10 ++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 4a14d46..74e5d00 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1281,11 +1281,13 @@
brands.add(objectMap.get("vehicle_brand").toString());
}
- Long count = chargingOrderService.countCar(brands);
- Map<String, Object> others = new HashMap<>();
- others.put("vehicle_brand","其他");
- others.put("counts",count);
+ if (carBrandMap.size()>=5) {
+ Long count = chargingOrderService.countCar(brands);
+ Map<String, Object> others = new HashMap<>();
+ others.put("vehicle_brand", "其他");
+ others.put("counts", count);
carBrandMap.add(others);
+ }
//本地车数量
Map<String,Object> localCarMap = chargingOrderService.countLocalCar();
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 ed930b2..bda3e7a 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
@@ -1549,9 +1549,13 @@
select count(1)
from
charging_pile_account.t_app_user_car
- where del_flag = 0 and vehicle_brand not in
+ where del_flag = 0
+
+ <if test="brands != null and brands.size() > 0">
+ and vehicle_brand not in
<foreach collection="brands" item="brand" open="(" separator="," close=")">
#{brand}
</foreach>
+ </if>
</select>
</mapper>
--
Gitblit v1.7.1