Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

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,可为空。

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,7 +285,7 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @param neighborHoodId
      * @return
      */
-    List<IcBuildingEntity> selectListByMap(@Param("customerId") String customerId,
+    List<IcBuildingDTO> selectListByMap(@Param("customerId") String customerId,
                                         @Param("gridId") String gridId,
                                         @Param("neighborHoodId") String neighborHoodId);
 }

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,7 +241,7 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      * @param buildingId
      * @return
      */
-    List<IcHouseEntity> selectListByMap(@Param("customerId") String customerId,
+    List<IcHouseDTO> selectListByMap(@Param("customerId") String customerId,
                                      @Param("gridId") String gridId,
                                      @Param("neighborHoodId") String neighborHoodId,
                                      @Param("buildingId") String buildingId);

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<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId) {
-        List<IcBuildingEntity> list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId);
+        List<IcBuildingDTO> list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId);
         return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
     }
 

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<IcHouseDTO> houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) {
-        List<IcHouseEntity> list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId);
+        List<IcHouseDTO> list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId);
         return ConvertUtils.sourceToTarget(list,IcHouseDTO.class);
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -604,9 +604,10 @@
     </select>
 
     <!--  楼栋列表  -->
-    <select id="selectListByMap" parameterType="map" resultType="com.epmet.entity.IcBuildingEntity">
+    <select id="selectListByMap" parameterType="map" resultType="com.epmet.dto.IcBuildingDTO">
         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 )

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -775,11 +775,18 @@
     </select>
 
     <!--    房屋列表 -->
-    <select id="selectListByMap" parameterType="map" resultType="com.epmet.entity.IcHouseEntity">
+    <select id="selectListByMap" parameterType="map" resultType="com.epmet.dto.IcHouseDTO">
         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