无日期查询当日

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java

@@ -49,6 +49,15 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
     @Override
     public PageData<FactUserHouseResultDTO> page(Map<String, Object> params) {
         PageData<FactUserHouseResultDTO> page = null;
+        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 (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString()) || OrgLevelEnum.COMMUNITY.getCode().equals(params.get("level").toString())) {
                 page = factGridUserHouseDailyService.page(params);
@@ -62,6 +71,15 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
     @Override
     public FactUserHouseResultDTO total(Map<String, Object> params) {
         FactUserHouseResultDTO dto = null;
+        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 (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
                 dto = factGridUserHouseDailyService.getTotal(params);