特殊人群：增加查询各类人员分布了

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanScreenController.java

@@ -30,9 +30,10 @@ public class LingShanScreenController {
      * @date: 2023/4/27 10:20 AM
      */
     @GetMapping("specialCrowdStats/qtyOfSubOrg")
-    public Result specialCrowdStatsCountBySubOrg(@RequestParam("parentAgencyId") String parentAgencyId) {
+    public Result specialCrowdStatsCountBySubOrg(@RequestParam("parentAgencyId") String parentAgencyId,
+                                                 @RequestParam(value = "specialType", required = false) String specialType) {
 
-        List<LingShanSpecialCrowdStatsByOrgResultDTO> l = lingShanScreenService.specialCrowdStatsCountBySubOrg(parentAgencyId);
+        List<LingShanSpecialCrowdStatsByOrgResultDTO> l = lingShanScreenService.specialCrowdStatsCountBySubOrg(parentAgencyId, specialType);
         return new Result().ok(l);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/LingShanScreenService.java

@@ -8,7 +8,7 @@ import java.util.List;
 public interface LingShanScreenService {
 
 
-    List<LingShanSpecialCrowdStatsByOrgResultDTO> specialCrowdStatsCountBySubOrg(String parentAgencyId);
+    List<LingShanSpecialCrowdStatsByOrgResultDTO> specialCrowdStatsCountBySubOrg(String parentAgencyId, String specialType);
 
     List<LingShanSpecialCrowdStatsBySpecialTypeResultDTO> specialCrowdStatsCountBySpecialType(String parentAgencyId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java

@@ -15,6 +15,7 @@ import com.epmet.entity.*;
 import com.epmet.enums.LingShanSpecialCrowdTypeEnums;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.LingShanScreenService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,7 +45,7 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     @Override
-    public List<LingShanSpecialCrowdStatsByOrgResultDTO> specialCrowdStatsCountBySubOrg(String parentAgencyId) {
+    public List<LingShanSpecialCrowdStatsByOrgResultDTO> specialCrowdStatsCountBySubOrg(String parentAgencyId, String specialType) {
         List<SubOrgResDTO> subOrgs = getResultDataOrThrowsException(govOrgOpenFeignClient.subOrgList(parentAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, null);
         List<String> orgIdPaths = subOrgs.stream().map(sub -> PidUtils.convertPid2OrgIdPath(sub.getOrgId(), sub.getPids())).collect(Collectors.toList());
 
@@ -58,11 +59,22 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
         }).collect(Collectors.toList());
 
 
-        List<LingShanSpecialCrowdStatsByOrgResultDTO> ol = azbjDao.statsCountsByOrgIds(orgIdPaths);
+        List<LingShanSpecialCrowdStatsByOrgResultDTO> ol = new ArrayList<>();
+        if (LingShanSpecialCrowdTypeEnums.AZBJ.getType().equals(specialType) || StringUtils.isBlank(specialType)) {
+            ol.addAll(azbjDao.statsCountsByOrgIds(orgIdPaths));
+        }
+        if (LingShanSpecialCrowdTypeEnums.SQJZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) {
             ol.addAll(sqjzDao.statsCountsByOrgIds(orgIdPaths));
+        }
+        if (LingShanSpecialCrowdTypeEnums.XFRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) {
             ol.addAll(xfryDao.statsCountsByOrgIds(orgIdPaths));
+        }
+        if (LingShanSpecialCrowdTypeEnums.JDRY.getType().equals(specialType) || StringUtils.isBlank(specialType)) {
             ol.addAll(jdryDao.statsCountsByOrgIds(orgIdPaths));
+        }
+        if (LingShanSpecialCrowdTypeEnums.JZHZ.getType().equals(specialType) || StringUtils.isBlank(specialType)) {
             ol.addAll(jzhzDao.statsCountsByOrgIds(orgIdPaths));
+        }
 
         // 开始给rl++
         for (LingShanSpecialCrowdStatsByOrgResultDTO o : ol) {