From 0e7301b5f2ecc1a9110802f444ee19f4ed1f8176 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 12 Oct 2022 15:55:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BA=BA?= =?UTF-8?q?=E6=88=BF=E4=BF=A1=E6=81=AF-=E7=82=B9=E5=87=BB"=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E5=B9=B3=E5=8F=B0=E7=A4=BE=E5=8C=BA=E6=95=B0"?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=EF=BC=8C=E5=8F=AA=E6=9F=A5=E8=AF=A2=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E5=B9=B3=E5=8F=B0=E7=A4=BE=E5=8C=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/HouseController.java | 4 +-- .../java/com/epmet/dao/CustomerAgencyDao.java | 4 +-- .../java/com/epmet/service/HouseService.java | 2 +- .../epmet/service/impl/AgencyServiceImpl.java | 6 ++-- .../epmet/service/impl/HouseServiceImpl.java | 5 +-- .../resources/mapper/CustomerAgencyDao.xml | 35 +++++++++---------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 79abda28a9..26268f34c1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -633,7 +633,7 @@ public class HouseController implements ResultDataResolver { * 针对社区的人房统计列表 * @return */ - @PostMapping("communityUserHouseStats") + @PostMapping("usingCommunityUserHouseStats") public Result> communityUserHouseStats(@RequestBody CommunityUserHouseStatsFormDTO input) { String orgId = input.getOrgId(); @@ -641,7 +641,7 @@ public class HouseController implements ResultDataResolver { Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); - PageData r = houseService.communityUserHouseStats(orgId, orgType, pageNo, pageSize); + PageData r = houseService.usingCommunityUserHouseStats(orgId, orgType, pageNo, pageSize); return new Result>().ok(r); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 31b80d3918..cc68f3335b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -389,13 +389,13 @@ public interface CustomerAgencyDao extends BaseDao { CustomerAgencyEntity getAgencyByUserId(@Param("userId") String userId, @Param("customerId") String customerId); /** - * 开通社区数统计 + * 开通社区列表 * @param agencyId 机关组织的id * @param agencyOrgIdPath agency的id路径path，包含自己 * @param endDate 截止日期，也即查询，截止改日期，有多少社区在使用 * @return */ - Integer getUsingCommunityStats(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); + List getUsingCommunityList(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); List getCommunitysByOrgIdPath(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 2973495dbf..d1d1b87503 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -198,5 +198,5 @@ public interface HouseService { PageData houseStatisListDetail(HouseChartFormDTO formDTO); - PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); + PageData usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize); } 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 7896a7854f..d5b194f006 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 @@ -1145,9 +1145,9 @@ public class AgencyServiceImpl implements AgencyService { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); agencyOrgIdPath = getOrgIdPath(agencyInfo.getPids(), agencyInfo.getId()); - Integer currentUsingCommunityCount = customerAgencyDao.getUsingCommunityStats(orgId, agencyOrgIdPath, null); - Integer prefersUsingCommunityCount = customerAgencyDao.getUsingCommunityStats(orgId, agencyOrgIdPath, endTime); - return new UsingCommunityStatsResultDTO(currentUsingCommunityCount, currentUsingCommunityCount - prefersUsingCommunityCount); + List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(orgId, agencyOrgIdPath, null); + List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(orgId, agencyOrgIdPath, endTime); + return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size()); } else if ("grid".equals(orgType)) { // 网格下不会有该数据，给个0 return new UsingCommunityStatsResultDTO(0, 0); 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 413bf6df2c..b08f38ddda 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 @@ -1394,12 +1394,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } @Override - public PageData communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { + public PageData usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { String customerId = EpmetRequestHolder.getLoginUserCustomerId(); PageHelper.startPage(pageNo, pageSize); - List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); + List communityIds = customerAgencyDao.getUsingCommunityList(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType), null); + // List communityIds = customerAgencyDao.getCommunitysByOrgIdPath(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); // 填充组织信息 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 80f0037382..1075de7982 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -1011,24 +1011,6 @@ LIMIT 1 - - - + + +