From c42cea4f1cec8ffad8f1460c169ed96a0ec651b2 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Wed, 13 Jul 2022 10:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=80=BB=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java | 6 ++++++
 .../card/service/impl/XhpcDataBigScreenServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/XhpcHistoryOrderMapper.xml  | 8 ++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java
index 047eb0d9..dc5c4be3 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java
@@ -33,6 +33,12 @@ public interface XhpcHistoryOrderMapper {
             @Param("userType") Integer userType,
             @Param("currentTime") String currentTime);
 
+    //社区用户统计
+    Long xhpcCommunityPersonnelSum();
+
+    //B端用户统计
+    Long xhpcCustomersPersonnelSum();
+
     /**
      * query total electric quantity by multiple tenant or multiple charging station
      *
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java
index ae5de551..997fcf9a 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java
@@ -123,8 +123,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
         Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null);
         List<Long> chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdsStr);
         //（0 C端用户 1 流量方用户 2社区用户 3B端用户）
-        Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdsStr, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null);
-        Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdsStr, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null);
+        Long communityUserCount = xhpcHistoryOrderMapper.xhpcCommunityPersonnelSum();
+        Long customerUserCount = xhpcHistoryOrderMapper.xhpcCustomersPersonnelSum();
         return R.ok(appUserCount + communityUserCount + customerUserCount);
 
         //judge care param function
diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 0be3e566..cb38c119 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -163,6 +163,14 @@
             </foreach>
         </if>
     </select>
+
+    <select id="xhpcCommunityPersonnelSum" resultType="long">
+        select count(community_personnel_id) from xhpc_community_personnel where del_flag =0
+    </select>
+    <select id="xhpcCustomersPersonnelSum" resultType="long">
+        select count(customers_personnel_id) from xhpc_customers_personnel where del_flag =0
+    </select>
+
     <select id="selectOrderTrendByTenantIdsAndChargingStationIds" resultType="java.util.Map">
         SELECT
         `current_time`,