From 3890c7da3e903425be1301149cfc14dbfb3574e7 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 16:29:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=88=E8=AE=A1=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
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 +-----
 .../epmet/service/stats/impl/FactUserHouseServiceImpl.java  | 3 +++
 3 files changed, 5 insertions(+), 10 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 0da74e4358..8fbf82b671 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,11 +74,7 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
-        List<FactUserHouseResultDTO> list = baseDao.listPage(params);
-        FactUserHouseResultDTO dto = getTotal(params);
-        dto.setAgencyName("合计");
-        list.add(dto);
-        return list;
+        return baseDao.listPage(params);
     }
 
     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 3a0ee91299..0aaa1f0c2e 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,11 +74,7 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
-        List<FactUserHouseResultDTO> list = baseDao.listPage(params);
-        FactUserHouseResultDTO dto = getTotal(params);
-        dto.setAgencyName("合计");
-        list.add(dto);
-        return list;
+        return baseDao.listPage(params);
     }
 
     private QueryWrapper<FactGridUserHouseDailyEntity> getWrapper(Map<String, Object> params) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
index 4d8a39348d..9a2851cf83 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
@@ -102,6 +102,9 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
                 list = factAgencyUserHouseDailyService.listExport(params);
             }
         }
+        FactUserHouseResultDTO dto = total(params);
+        dto.setAgencyName("合计");
+        list.add(dto);
         return list;
     }