diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 334e674f75..424cba462d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -83,7 +83,7 @@ public interface GovOrgCoverageService { * @return */ List searchByResiNumber(String customerId, String agencyIdPath, String search, Integer resiNumberGreaterThan, - Boolean isPage, Integer pageNo, Integer pageSize); + Integer rentFlag, Boolean isPage, Integer pageNo, Integer pageSize); /** * 搜索公共服务 @@ -129,7 +129,7 @@ public interface GovOrgCoverageService { * @param resiNumberBiggerThan 查询居住人数大于多少的房屋 * @return */ - Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan); + Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan, Integer rentFlag); /** * 查询客户下,指定分类key对应的对象数据 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 12e1e789e7..85b7d2569c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -196,8 +196,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { @Override public List searchByResiNumber(String customerId, String agencyIdPath, String search, Integer resiNumberGreaterThan, - Boolean isPage, Integer pageNo, Integer pageSize) { - LambdaQueryWrapper query = constructHouseByResiNumber(customerId, agencyIdPath, search, resiNumberGreaterThan); + Integer rentFlag, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = constructHouseByResiNumber(customerId, agencyIdPath, search, resiNumberGreaterThan, rentFlag); if (isPage) { PageHelper.startPage(pageNo, pageSize); } @@ -305,20 +305,22 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { } @Override - public Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan) { - return ichousedao.selectCount(constructHouseByResiNumber(customerId, staffOrgIds, search, resiNumberBiggerThan)); + public Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan, Integer rentFlag) { + return ichousedao.selectCount(constructHouseByResiNumber(customerId, staffOrgIds, search, resiNumberBiggerThan, rentFlag)); } /** * 为"根据居住人数查询房屋"构造条件 */ - private LambdaQueryWrapper constructHouseByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan) { + private LambdaQueryWrapper constructHouseByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan, + Integer rentFlag) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcHouseEntity::getCustomerId, customerId); query.likeRight(IcHouseEntity::getOrgIdPath, staffOrgIds); if (StringUtils.isNotBlank(search)) { query.like(IcHouseEntity::getFullName, search); } + query.eq(rentFlag != null, IcHouseEntity::getRentFlag, rentFlag); query.ge(IcHouseEntity::getResiNumber, resiNumberBiggerThan); return query; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 01a3464762..b5f8a0ec3a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -66,6 +66,9 @@ public class CoverageServiceImpl implements CoverageService { public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource"; public static final String PLACE_TYPE_PARTY_UNIT= "party_unit"; + // 1:出租 0:自住 2:闲置 3:未售出 + public static final Integer HOUSE_RENT_FLAG_RENT = 1; + /** * 图层,大屏数据分析,数据列表 * @param coverageTypes 图层列表 @@ -250,7 +253,7 @@ public class CoverageServiceImpl implements CoverageService { return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋,住的人口超过5人属于群租房(是个规定 - return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5); + return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT); } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { // 公共服务 return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey); @@ -374,7 +377,9 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋,住的人口超过5人属于群租房(是个规定 - List houses = orgCoverageService.searchByResiNumber(customerId, staffOrgIds, search, 5, isPage, pageNo, pageSize); + List houses = orgCoverageService.searchByResiNumber( + customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT, isPage, pageNo, pageSize); + return houses.parallelStream().map(h -> { BuildingInfoCache buildingInfo = govOrgService.queryBuildingInfo(h.getBuildingId()); String latitude = null; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index dd02ccda7f..c5f04ae7bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -49,6 +49,7 @@ and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%') and resi.DEL_FLAG = '0' and s.DEL_FLAG = '0' + and resi.STATUS='0' order by s.CREATED_TIME asc @@ -65,6 +66,7 @@ and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%') and resi.DEL_FLAG = '0' and s.DEL_FLAG = '0' + and resi.STATUS='0'