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

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO;
+import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.entity.IcHouseEntity;
@@ -68,4 +69,5 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
     List<BaseInfoFamilyBuildingResultDTO> baseInfoFamilyBuilding(@Param("neighborHoodId")String neighborHoodId);
 
     Integer checkBuildName(@Param("neighborHoodId") String neighborHoodId,@Param("buildingName")String buildingName, @Param("buildingId")String buildingId);
+    List<BuildingResultDTO> buildingListByIds(@Param("buildingIdList") List<String> buildingIdList);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -13,6 +13,7 @@ import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.form.IcBulidingFormDTO;
 import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
+import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.entity.*;
 import com.epmet.enums.BuildingTypeEnums;
@@ -283,6 +284,10 @@ public class BuildingServiceImpl implements BuildingService {
         ExcelPoiUtils.exportExcel(templatePath ,map,"楼宇信息录入表",response);
         return ;
     }
+    @Override
+    public List<BuildingResultDTO> buildingListByIds(List<String> buildingIdList) {
+        return icBuildingDao.buildingListByIds(buildingIdList);
+    }
     private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) {
 
 //        QueryWrapper<IcNeighborHoodEntity> neighborHoodEntityQueryWrapper = new QueryWrapper<>();

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

@@ -310,4 +310,24 @@
         </if>
     </select>
 
+    <select id="buildingListByIds" resultType="com.epmet.dto.result.BuildingResultDTO">
+        select
+        a.ID as buildingId,
+        a.BUILDING_NAME as buildingName,
+        b.NEIGHBOR_HOOD_NAME as neighborHoodName,
+        d.GRID_NAME as gridName
+        from ic_building a
+
+        LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID  and b.DEL_FLAG='0'
+
+        LEFT JOIN customer_grid d on b.GRID_ID = d.ID  and d.DEL_FLAG='0'
+
+        where 1=1 and a.DEL_FLAG ='0'
+        and a.ID in
+        <foreach collection="buildingIdList" open="(" separator="," close=")" item="val">
+            #{val}
+        </foreach>
+
+    </select>
+
 </mapper>