From 47654280b09cf901dc473c70731d161d7b299d49 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 Jan 2023 14:12:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=80=E9=80=9A=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E6=95=B0=E8=BE=83=E4=B8=8A=E6=9C=88=E9=BB=98=E8=AE=A4=E5=86=99?= =?UTF-8?q?=E6=AD=BB0=20=E3=80=82=E9=A1=B9=E7=9B=AE=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AgencyServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 6833141ad4..fcb04db161 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -1149,8 +1149,9 @@ public class AgencyServiceImpl implements AgencyService { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); agencyOrgIdPath = getOrgIdPath(agencyInfo.getPids(), agencyInfo.getId()); List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, null); - List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, endTime); - return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size()); + // List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, endTime); + // return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size()); + return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), 0); } else if ("grid".equals(orgType)) { // 网格下不会有该数据，给个0 return new UsingCommunityStatsResultDTO(0, 0); From 6ba2e1f581977d7daec83320440e73435864f03d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 11 Jan 2023 14:31:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=94=E7=83=9F=E5=8F=B0=E8=A6=81?= =?UTF-8?q?=E6=B1=82=20=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89=E2=80=9C?= =?UTF-8?q?=E8=BE=83=E4=B8=8A=E6=9C=88=E2=80=9D=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=AB=AF=E7=A8=8B=E5=BA=8F=E4=B9=9F=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=EF=BC=8C=E6=8F=90=E5=8D=87=E6=8E=A5=E5=8F=A3=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=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