From aa63a9bdd6c7fba2527bfef773b43ea51b0d6f83 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 May 2023 17:49:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=82=B9=E4=BD=8D=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=B0=8F=E5=8C=BA=E5=90=8D=E6=88=90=EF=BC=8C=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E7=82=B9=E4=BD=8D=E8=BF=94=E5=9B=9E=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E6=A5=BC=E6=A0=8B=E5=90=8D=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E5=85=83=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcBuildingDTO.java | 4 ++++ .../src/main/java/com/epmet/dao/IcBuildingDao.java | 7 ++++--- .../src/main/java/com/epmet/dao/IcHouseDao.java | 9 +++++---- .../com/epmet/service/impl/BuildingServiceImpl.java | 2 +- .../java/com/epmet/service/impl/HouseServiceImpl.java | 2 +- .../src/main/resources/mapper/IcBuildingDao.xml | 5 +++-- .../src/main/resources/mapper/IcHouseDao.xml | 11 +++++++++-- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java index 52567226eb..cbd1178ec4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java @@ -49,6 +49,10 @@ public class IcBuildingDTO implements Serializable { * 小区id */ private String neighborHoodId; + /** + * 灵山项目添加 + */ + private String neighborHoodName; /** * 片区id，neighbor_hood_part.id,可为空。 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index ca6b57a3c5..3ec90e6267 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; @@ -284,8 +285,8 @@ public interface IcBuildingDao extends BaseDao { * @param neighborHoodId * @return */ - List selectListByMap(@Param("customerId") String customerId, - @Param("gridId") String gridId, - @Param("neighborHoodId") String neighborHoodId); + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId); } 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 c2eedacf63..787c644924 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 @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.GetHouseInfoToCollectFormDTO; @@ -240,8 +241,8 @@ public interface IcHouseDao extends BaseDao { * @param buildingId * @return */ - List selectListByMap(@Param("customerId") String customerId, - @Param("gridId") String gridId, - @Param("neighborHoodId") String neighborHoodId, - @Param("buildingId") String buildingId); + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index e3693d109d..998dee8d45 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -774,7 +774,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { - List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); + List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); } 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 fa053665de..68f4a47831 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 @@ -1540,7 +1540,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { */ @Override public List houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { - List list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + List list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 2d632d7b2d..6623f0a724 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -604,9 +604,10 @@ - SELECT - ib.* + ib.*, + h.NEIGHBOR_HOOD_NAME as neighborHoodName FROM ic_building ib LEFT JOIN ic_neighbor_hood h ON ( ib.NEIGHBOR_HOOD_ID = h.ID ) 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 6e250fb9e6..470447f5c0 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 @@ -775,11 +775,18 @@ - SELECT - ih.* + ih.*, + h.NEIGHBOR_HOOD_NAME as neighborHoodName, + ib.BUILDING_NAME as buildingName, + u.UNIT_NAME as unitName FROM ic_house ih + left join ic_building ib + on(ih.BUILDING_ID=ib.id) + left join ic_building_unit u + on(ih.BUILDING_UNIT_ID=u.id) LEFT JOIN ic_neighbor_hood h ON ( ih.NEIGHBOR_HOOD_ID = h.ID ) WHERE