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 dfe659b250..c4bf83da0d 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
@@ -73,20 +73,50 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
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);
+ if (params.containsKey("level")) {
+ if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
+ params.put("dateId", params.get("startTime").toString().replaceAll("-", ""));
+ FactUserHouseResultDTO dtoStart = factGridUserHouseDailyService.getTotal(params);
+ params.put("dateId", params.get("endTime").toString().replaceAll("-", ""));
+ FactUserHouseResultDTO dtoEnd = factGridUserHouseDailyService.getTotal(params);
+ dto = dtoEnd;
+ dto.setHouseIncr(dtoEnd.getHouseIncr() - dtoStart.getHouseIncr());
+ dto.setHouseModify(dtoEnd.getHouseModify() - dtoStart.getHouseModify());
+ dto.setUserIncr(dtoEnd.getUserIncr() - dtoStart.getUserIncr());
+ dto.setUserModify(dtoEnd.getUserModify() - dtoStart.getUserModify());
+ } else {
+ params.put("dateId", params.get("startTime").toString().replaceAll("-", ""));
+ FactUserHouseResultDTO dtoStart = factAgencyUserHouseDailyService.getTotal(params);
+ params.put("dateId", params.get("endTime").toString().replaceAll("-", ""));
+ FactUserHouseResultDTO dtoEnd = factAgencyUserHouseDailyService.getTotal(params);
+ dto = dtoEnd;
+ dto.setHouseIncr(dtoEnd.getHouseIncr() - dtoStart.getHouseIncr());
+ dto.setHouseModify(dtoEnd.getHouseModify() - dtoStart.getHouseModify());
+ dto.setUserIncr(dtoEnd.getUserIncr() - dtoStart.getUserIncr());
+ dto.setUserModify(dtoEnd.getUserModify() - dtoStart.getUserModify());
+ }
+ }
} 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);
+ } else {
+ dto = factAgencyUserHouseDailyService.getTotal(params);
+ }
+ }
}
} 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);
- } else {
- dto = factAgencyUserHouseDailyService.getTotal(params);
+ if (params.containsKey("level")) {
+ if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
+ dto = factGridUserHouseDailyService.getTotal(params);
+ } else {
+ dto = factAgencyUserHouseDailyService.getTotal(params);
+ }
}
}
+
return dto;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml
index f5ed40e7ca..50ca4b5ddf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml
@@ -114,12 +114,6 @@
AND a.DATE_ID = #{dateId}
-
- AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
-
-
- AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) <= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
-
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
index d7765a73ef..57d72c45ac 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
@@ -104,12 +104,6 @@
AND d.DATE_ID = #{dateId}
-
- AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
-
-
- AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) <= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
-