From 0397fc16e0c6c1ae9fba84f50fe6a433f283b8bd Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 30 May 2022 18:17:24 +0800
Subject: [PATCH] =?UTF-8?q?=20sql=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/impl/FactUserHouseServiceImpl.java  | 44 ++++++++++++++++---
 .../stats/FactAgencyUserHouseDailyDao.xml     |  6 ---
 .../stats/FactGridUserHouseDailyDao.xml       |  6 ---
 3 files changed, 37 insertions(+), 19 deletions(-)

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 @@
         <if test="dateId != null and dateId != ''">
             AND a.DATE_ID = #{dateId}
         </if>
-        <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
-        </if>
-        <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
-        </if>
     </select>
 
     <delete id="deleteByDateId">
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 @@
         <if test="dateId != null and dateId != ''">
             AND d.DATE_ID = #{dateId}
         </if>
-        <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
-        </if>
-        <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
-        </if>
     </select>
 
     <select id="statAgency" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">