From 6ba2e1f581977d7daec83320440e73435864f03d Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 11 Jan 2023 14:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=83=9F=E5=8F=B0=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89=E2=80=9C=E8=BE=83?=
 =?UTF-8?q?=E4=B8=8A=E6=9C=88=E2=80=9D=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E7=A8=8B=E5=BA=8F=E4=B9=9F=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E6=8E=A5=E5=8F=A3=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/HouseServiceImpl.java | 3 ++-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 56b87d06fa..4cd8945a4a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -724,6 +724,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         resultDTO.setOrgId(formDTO.getOrgId());
         resultDTO.setOrgType(formDTO.getOrgType());
 
+        /*应烟台要求 页面去掉“较上月”的数据，后端程序也去掉，提升接口相应时间
         // 加载上个月，该组织的人房统计信息，并且计算较上月信息
         Date lastDayOfLastMonth = DateUtils.getLastDayOfMonth(DateUtils.addDateMonths(new Date(), -1));
         UserHouseStatsQueryFormDTO form = new UserHouseStatsQueryFormDTO(formDTO.getOrgId(), formDTO.getOrgType(), DateUtils.format(lastDayOfLastMonth, "yyyyMMdd"));
@@ -733,7 +734,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         resultDTO.setHouseTotalJSY(resultDTO.getHouseTotal() - lastMonthUserHouseStats.getHouseTotal());
         resultDTO.setCzHouseTotalJSY(resultDTO.getCzHouseTotal() - lastMonthUserHouseStats.getCzHouseTotal());
         resultDTO.setXzHouseTotalJSY(resultDTO.getXzHouseTotal() - lastMonthUserHouseStats.getXzHouseTotal());
-        resultDTO.setZzHouseTotalJSY(resultDTO.getZzHouseTotal() - lastMonthUserHouseStats.getZzHouseTotal());
+        resultDTO.setZzHouseTotalJSY(resultDTO.getZzHouseTotal() - lastMonthUserHouseStats.getZzHouseTotal());*/
         return resultDTO;
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 49336ffb95..a9a98a0a3e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2112,6 +2112,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         resultDTO.setOrgId(formDTO.getOrgId());
         resultDTO.setOrgType(formDTO.getOrgType());
 
+        /*应烟台要求 页面去掉“较上月”的数据，后端程序也去掉，提升接口相应时间
         // 计算较上月的数据
         Date lastDayOfLastMonth = DateUtils.getLastDayOfMonth(DateUtils.addDateMonths(new Date(), -1));
         UserHouseStatsQueryFormDTO form = new UserHouseStatsQueryFormDTO(formDTO.getOrgId(), formDTO.getOrgType(), DateUtils.format(lastDayOfLastMonth, "yyyyMMdd"));
@@ -2120,7 +2121,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         resultDTO.setUserTotalJSY(resultDTO.getUserTotal() - lastMonthUserHouseStats.getUserTotal());
         resultDTO.setCzUserTotalJSY(resultDTO.getCzUserTotal() - lastMonthUserHouseStats.getCzUserTotal());
-        resultDTO.setLdUserTotalJSY(resultDTO.getLdUserTotal() - lastMonthUserHouseStats.getLdUserTotal());
+        resultDTO.setLdUserTotalJSY(resultDTO.getLdUserTotal() - lastMonthUserHouseStats.getLdUserTotal());*/
 
         return resultDTO;
     }