人防统计BUG

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);
     }
 
-}
+}

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);
     }
 

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);
     }
 

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);