From 5445aac167d5398e14cce798214e5d65c6c2399c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 21 Jul 2022 17:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E9=98=B2=E7=BB=9F=E8=AE=A1BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/impl/FactAgencyUserHouseDailyServiceImpl.java  | 3 ++-
 .../stats/impl/FactGridUserHouseDailyServiceImpl.java    | 1 +
 .../impl/FactNeighborhoodUserHouseDailyServiceImpl.java  | 1 +
 .../service/stats/impl/FactUserHouseServiceImpl.java     | 9 +++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

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..8268d3f71b 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,6 +74,7 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         return baseDao.listPage(params);
     }
 
@@ -118,4 +119,4 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
         baseDao.deleteByDateId(formDTO);
     }
 
-}
\ No newline at end of file
+}
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 7aef227b16..a3c6a9b6c9 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
@@ -82,6 +82,7 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         return baseDao.listPage(params);
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactNeighborhoodUserHouseDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactNeighborhoodUserHouseDailyServiceImpl.java
index 8772511aa0..032886bad0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactNeighborhoodUserHouseDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactNeighborhoodUserHouseDailyServiceImpl.java
@@ -93,6 +93,7 @@ public class FactNeighborhoodUserHouseDailyServiceImpl extends BaseServiceImpl<F
 
     @Override
     public List<FactUserHouseResultDTO> listExport(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         return baseDao.listPage(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 db20e4ccc6..940359a1af 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
@@ -103,6 +103,15 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
     @Override
     public List<FactUserHouseResultDTO> list(Map<String, Object> params) {
         List<FactUserHouseResultDTO> list = new ArrayList<>();
+        if (params.containsKey("startTime") && params.containsKey("endTime")) {
+            if (StringUtils.isNotBlank(params.get("startTime").toString()) && StringUtils.isNotBlank(params.get("endTime").toString())) {
+                params.put("dateId", StringUtils.EMPTY);
+            } else {
+                params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
+            }
+        } else {
+            params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
+        }
         if (params.containsKey("level")) {
             if("neighborhood".equals(params.get("level").toString()) || OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())){
                 list = factNeighborhoodUserHouseDailyService.listExport(params);