直接返回小区

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java

@@ -69,6 +69,11 @@ public class IcNeighborHoodDTO implements Serializable {
      */
 	private String gridId;
 
+    /**
+     * 网格
+     */
+    private String gridName;
+
     /**
      * 详细地址
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -155,13 +155,13 @@ public class IcNeighborHoodController {
      *
      * @param tokenDto
      * @param dto
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.IcNeighborHoodDTO>>
      * @author zhy
-     * @date 2022/8/19 13:32
+     * @date 2022/8/19 15:56
      */
     @PostMapping("neighborhoodlist")
-    public Result<List<OptionResultDTO>> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
-        return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto));
+    public Result<List<IcNeighborHoodDTO>> getNeighborhoodList(@LoginUser TokenDto tokenDto, @RequestBody IcNeighborHoodDTO dto) {
+        return new Result<List<IcNeighborHoodDTO>>().ok(icNeighborHoodService.getNeighborhoodList(tokenDto, dto));
     }
 
     /**

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

@@ -18,7 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.NeighborHoodAndManagementDTO;
@@ -214,24 +213,13 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     List<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO);
 
     /**
-     * 小区-楼栋列表
+     * 小区
      *
      * @param formDTO
-     * @return java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>
+     * @return java.util.List<com.epmet.dto.IcNeighborHoodDTO>
      * @author zhy
-     * @date 2022/8/19 14:01
+     * @date 2022/8/19 15:57
      */
-    List<OptionResultDTO> getNeighborhoodBuildingList(IcNeighborHoodDTO formDTO);
-
-
-    /**
-     * 楼栋列表
-     *
-     * @param neighborhoodId
-     * @return java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>
-     * @author zhy
-     * @date 2022/8/19 14:01
-     */
-    List<OptionResultDTO> selectBuildingList(@Param("value") String neighborhoodId);
+    List<IcNeighborHoodDTO> getNeighborhoodList(IcNeighborHoodDTO formDTO);
 
 }

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

@@ -122,11 +122,11 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      *
      * @param tokenDto
      * @param dto
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>>
+     * @return java.util.List<com.epmet.dto.IcNeighborHoodDTO>
      * @author zhy
-     * @date 2022/8/19 13:32
+     * @date 2022/8/19 15:57
      */
-    List<OptionResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto);
+    List<IcNeighborHoodDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto);
 
     /**
      * @Description 通过ID查询小区信息

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

@@ -211,7 +211,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         }).collect(Collectors.toList());
     }
 
-    public List<OptionResultDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {
+    public List<IcNeighborHoodDTO> getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {
         dto.setCustomerId(tokenDto.getCustomerId());
         if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) {
             log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区");
@@ -222,7 +222,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             }
             dto.setAgencyId(result.getAgencyId());
         }
-        return baseDao.getNeighborhoodBuildingList(dto);
+        return baseDao.getNeighborhoodList(dto);
     }
 
     /**

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

@@ -25,16 +25,6 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <!-- 小区楼栋关系 -->
-    <resultMap id="neighborhoodBuildingMap" type="com.epmet.commons.tools.dto.result.OptionResultDTO">
-        <id column="value" property="value" />
-        <result column="label" property="label"/>
-        <collection property="children" column="value" ofType="com.epmet.commons.tools.dto.result.OptionResultDTO" select="selectBuildingList">
-            <id column="value" property="value" />
-            <result column="label" property="label" />
-        </collection>
-    </resultMap>
-
     <!-- 更新小区详细地址和备注 -->
     <update id="updateNeighborHood">
         update ic_neighbor_hood
@@ -673,32 +663,24 @@
             SORT, DOOR_NAME+0
     </select>
 
-    <select id="getNeighborhoodBuildingList" resultMap="neighborhoodBuildingMap">
+    <select id="getNeighborhoodList" resultType="com.epmet.dto.IcNeighborHoodDTO">
         SELECT
-            id AS 'value',
-            NEIGHBOR_HOOD_NAME AS label
+        n.id,
+        n.NEIGHBOR_HOOD_NAME,
+        n.GRID_ID,
+        g.GRID_NAME
         FROM
-            ic_neighbor_hood
+        ic_neighbor_hood n
+        LEFT JOIN customer_grid g ON n.GRID_ID = g.id
         WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
+        n.DEL_FLAG = '0'
+          AND n.CUSTOMER_ID = #{customerId}
         <if test="gridId != null and gridId != ''">
-            AND GRID_ID = #{gridId}
+            AND n.GRID_ID = #{gridId}
         </if>
           AND (
-                    AGENCY_ID = #{agencyId}
-                OR AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
-    </select>
-
-    <select id="selectBuildingList" parameterType="map" resultType="com.epmet.commons.tools.dto.result.OptionResultDTO">
-        SELECT
-            id AS 'value',
-            BUILDING_NAME AS label
-        FROM
-            ic_building
-        WHERE
-            DEL_FLAG = '0'
-          AND NEIGHBOR_HOOD_ID = #{value}
+        n.AGENCY_ID = #{agencyId}
+                OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
     </select>
 
 </mapper>