diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 4d5c986eff..1f3ceacfe5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -211,4 +211,6 @@ public interface IcHouseDao extends BaseDao { IcHouseEntity getHouseInfoByName(CheckHouseInfoFormDTO formDTO); List houseStatisListDetail(HouseChartFormDTO formDTO); + + List selectListForRenFangStats(@Param("buildingId") String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 2a1b036570..0f69fc8816 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -162,10 +162,13 @@ public class IcHouseServiceImpl extends BaseServiceImpl getHouseList(TokenDto tokenDto, HouseFormDTO formDTO) { //查询楼栋下房屋列表 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId()); - wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC"); - List list = baseDao.selectList(wrapper); +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId()); +// wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC"); +// List list = baseDao.selectList(wrapper); + + List list = baseDao.selectListForRenFangStats(formDTO.getBuildingId()); + if (CollectionUtils.isEmpty(list)) { return Collections.emptyList(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 5cfdd0fd4d..ed9bc5acd9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -638,5 +638,48 @@ CONVERT(a.DOOR_NAME using gbk) - +