From bbfcb88f7bf9a335ec1052fcf9bf3c56c9d58abc Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 10:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/impl/FactAgencyUserHouseDailyServiceImpl.java     | 6 +++++-
 .../stats/impl/FactGridUserHouseDailyServiceImpl.java       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java
index 8fbf82b671..0da74e4358 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java
@@ -74,7 +74,11 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
-        return baseDao.listPage(params);
+        List<FactUserHouseResultDTO> list = baseDao.listPage(params);
+        FactUserHouseResultDTO dto = getTotal(params);
+        dto.setAgencyName("合计");
+        list.add(dto);
+        return list;
     }
 
     private QueryWrapper<FactAgencyUserHouseDailyEntity> getWrapper(Map<String, Object> params) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
index 0aaa1f0c2e..3a0ee91299 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
@@ -74,7 +74,11 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
-        return baseDao.listPage(params);
+        List<FactUserHouseResultDTO> list = baseDao.listPage(params);
+        FactUserHouseResultDTO dto = getTotal(params);
+        dto.setAgencyName("合计");
+        list.add(dto);
+        return list;
     }
 
     private QueryWrapper<FactGridUserHouseDailyEntity> getWrapper(Map<String, Object> params) {