返回下级组织数量

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

@@ -1,5 +1,7 @@
 package com.epmet.dto.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * @Date 2023/4/6 16:46
  * @Author lichao
  **/
+@Data
 public class AgencyCountCensusResultDTO implements Serializable {
 
     private static final long serialVersionUID = 4360690752084258055L;

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

@@ -517,7 +517,13 @@ public class CustomerAgencyController {
         return customerAgencyService.getCurrentUserCommunityInfo(tokenDTO);
     }
 
-
+    /**
+     * @Description: 返回下级数量统计
+     * @param agencyId:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AgencyCountCensusResultDTO>>
+     * @Author: lichao
+     * @Date: 2023/4/7 14:48
+     */
     @GetMapping("getAgencyCountList")
     public Result<List<AgencyCountCensusResultDTO>> getAgencyCountList(@RequestParam String agencyId){
         return new Result<List<AgencyCountCensusResultDTO>>().ok(customerAgencyService.getAgencyCountList(agencyId));
@@ -525,4 +531,7 @@ public class CustomerAgencyController {
 
 
 
+
+
+
 }

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

@@ -430,6 +430,10 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     List<AgencyResultDTO> getAllCommunity(String customerId);
 
-    Integer agencyCount(@Param("pids") String pids,@Param("level") String level);
+    List<AgencyCountCensusResultDTO> agencyCount(@Param("pids") String pids);
+
+    Integer agencyGridCount(@Param("pids") String pids);
+
+    Integer agencyStaffCount(@Param("pids") String pids);
 }
 

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

@@ -362,5 +362,11 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @return
      */
     String getOrgIdPath(String orgId);
+
+    /**
+     * 返回下级数量
+     * @param agencyId
+     * @return
+     */
     List<AgencyCountCensusResultDTO> getAgencyCountList(String agencyId);
 }

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

@@ -37,6 +37,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.PidUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.constant.CustomerGridConstant;
@@ -1624,6 +1625,14 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         }
         return customerAgencyEntity.getPids().concat(StrConstant.COLON).concat(orgId);
     }
+
+    /**
+     * @Description:
+     * @param agencyId:
+     * @Return java.util.List<com.epmet.dto.result.AgencyCountCensusResultDTO>
+     * @Author: lichao
+     * @Date: 2023/4/7 14:17
+     */
     @Override
     public List<AgencyCountCensusResultDTO> getAgencyCountList(String agencyId) {
 
@@ -1631,23 +1640,21 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
 
         CustomerAgencyEntity customerAgency = baseDao.selectById(agencyId);
         if (customerAgency != null){
-//            pidu
-            // 区县级
-            if (customerAgency.getLevel().equals("district")){
-//                Integer count = baseDao.agencyCount()
-                // 镇街级
-            }else if (customerAgency.getLevel().equals("street")){
-
-
-            }else{
-
-
-            }
+            String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids());
+            agencyCountCensusResultDTOS = baseDao.agencyCount(pids);
+            AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO();
+            agencyCountCensusResultDTOGrid.setLevel("grid");
+            agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids));
+            agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOGrid);
+
+            AgencyCountCensusResultDTO agencyCountCensusResultDTOStaff = new AgencyCountCensusResultDTO();
+            agencyCountCensusResultDTOStaff.setLevel("staff");
+            agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids));
+            agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOStaff);
 
         }else{
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常");
         }
-
         return agencyCountCensusResultDTOS;
     }
 

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

@@ -863,13 +863,34 @@
             AND CUSTOMER_ID = #{customerId}
             AND pids LIKE concat('%',#{agencyId}, '%' )
     </update>
-    <select id="agencyCount" resultType="java.lang.Integer">
+    <select id="agencyCount" resultType="com.epmet.dto.result.AgencyCountCensusResultDTO">
 
-        select count(*)
+        select level,count(*)
         from customer_agency
         where DEL_FLAG = 0
-            and LEVEL = #{level}
             and PIDS like concat(#{pids},'%')
+            group by level
+
+    </select>
+
+    <select id="agencyGridCount" resultType="java.lang.Integer">
+
+        select count(*)
+        from customer_grid
+        where DEL_FLAG = 0
+          and PIDS like concat(#{pids},'%')
+
+    </select>
+
+    <select id="agencyStaffCount" resultType="java.lang.Integer">
+
+        select count(1)
+        from customer_staff_agency staff
+        left join customer_agency agency on staff.AGENCY_ID = agency.ID
+        where agency.DEL_FLAG = 0
+          and
+              staff.DEL_FLAG = 0
+          and agency.PIDS like concat(#{pids},'%')
 
     </select>