物业管理管理小区数量计算：添加备注

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

@@ -36,7 +36,8 @@ public interface IcNeighborHoodPropertyDao extends BaseDao<IcNeighborHoodPropert
     /**
      * 查询物业下的小区名称
      * @param propertyId 物业id
-     * @return
+     * @param agencyId 组织id
+     * @return 当前物业在 当前组织及下级范围内，管理的小区数量
      */
     List<IcNeighborHoodDTO> getNeighborHoodList(@Param("propertyId") String propertyId, @Param("agencyId") String agencyId);
 }

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

@@ -184,13 +184,13 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
      */
     @Override
     public PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name, String contactName, String contactMobile) {
-        CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId());
+        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId());
         PageHelper.startPage(pageNo, pageSize);
-        List<IcPropertyManagementDTO> list = icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(), name, contactName, contactMobile,staffInfoCacheResult.getAgencyId());
+        List<IcPropertyManagementDTO> list = icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(), name, contactName, contactMobile, staffInfoCacheResult.getAgencyId());
         PageInfo<IcPropertyManagementDTO> pageInfo = new PageInfo<>(list);
         // 导出时需要导出关联的小区名称
         pageInfo.getList().forEach(result -> {
-            List<IcNeighborHoodDTO> neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(result.getId(),staffInfoCacheResult.getAgencyId());
+            List<IcNeighborHoodDTO> neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(result.getId(), staffInfoCacheResult.getAgencyId());
             List<String> neighborHoodNames = neighborHoodList.stream()
                     .map(IcNeighborHoodDTO::getNeighborHoodName)
                     .distinct().collect(Collectors.toList());

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

@@ -15,6 +15,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!--    当前物业在 当前组织及下级范围内，管理的小区数量 -->
     <select id="getNeighborHoodList" parameterType="java.lang.String" resultType="com.epmet.dto.IcNeighborHoodDTO">
         SELECT
             p.NEIGHBOR_HOOD_ID,
@@ -24,7 +25,7 @@
         INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID )
         WHERE
             p.PROPERTY_ID = #{propertyId}
-          AND (h.AGENCY_ID =#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
+          AND (h.AGENCY_ID = #{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
           AND p.DEL_FLAG = '0'
           AND h.DEL_FLAG = '0'
         order by h.CREATED_TIME asc