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

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/VolunteerCommonFormDTO.java

@@ -20,9 +20,9 @@ public class VolunteerCommonFormDTO {
     private String customerId;
 
     /**
-     * 上级组织ID，使用PIDS like，查询该组织下所有志愿者，注意，是like 'agencyId:%'
+     * 组织ID
      */
-    private String superiorAgencyId;
+    private String agencyId;
 
     private Integer pageNo = 0;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java

@@ -141,8 +141,8 @@ public class ResiVolunteerController {
         Integer pageNo = input.getPageNo();
         Integer pageSize = input.getPageSize();
         String customerId = input.getCustomerId();
-        String superiorAgencyId = input.getSuperiorAgencyId();
+        String agencyId = input.getAgencyId();
-        List<PageVolunteerInfoResultDTO> l = volunteerInfoService.queryVolunteerPage(customerId, pageNo, pageSize, superiorAgencyId);
+        List<PageVolunteerInfoResultDTO> l = volunteerInfoService.queryVolunteerPage(customerId, pageNo, pageSize, agencyId);
         return new Result<List<PageVolunteerInfoResultDTO>>().ok(l);
     }
 
@@ -154,9 +154,9 @@ public class ResiVolunteerController {
     @PostMapping("count")
     public Result<Integer> getVolunteerCount(@RequestBody VolunteerCommonFormDTO input) {
         String customerId = input.getCustomerId();
-        String pidsPrefix = input.getSuperiorAgencyId();
+        String agencyId = input.getAgencyId();
 
-        Integer volunteerCount = volunteerInfoService.getVolunteerCount(customerId, pidsPrefix);
+        Integer volunteerCount = volunteerInfoService.getVolunteerCount(customerId, agencyId);
         return new Result<Integer>().ok(volunteerCount);
     }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java

@@ -95,12 +95,20 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      */
     List<OptionDTO> queryListVolunteer(String customerId,String staffId,String userRealName);
 
-    List<PageVolunteerInfoResultDTO> queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String superiorAgencyId);
+    /**
+     * @param customerId
+     * @param pageNo
+     * @param pageSize
+     * @param agencyId 组织ID，使用PIDS like，查询该组织"及下级"所有志愿者
+     * @return
+     */
+    List<PageVolunteerInfoResultDTO> queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String agencyId);
 
     /**
      * 查询志愿者数量
      * @param customerId
+     * @param agencyId 组织ID，查询该组织"及下级"下所有的志愿者
      * @return
      */
-    Integer getVolunteerCount(String customerId, String pidsPrefix);
+    Integer getVolunteerCount(String customerId, String agencyId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -358,24 +358,11 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     }
 
     @Override
-    public List<PageVolunteerInfoResultDTO> queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String superiorAgencyId) {
+    public List<PageVolunteerInfoResultDTO> queryVolunteerPage(String customerId, Integer pageNo, Integer pageSize, String agencyId) {
         LambdaQueryWrapper<VolunteerInfoEntity> query = new LambdaQueryWrapper<>();
         Optional.ofNullable(customerId).ifPresent(cid -> query.eq(VolunteerInfoEntity::getCustomerId, cid));
-        Optional.ofNullable(superiorAgencyId).ifPresent(cid -> {
+        Optional.ofNullable(agencyId).ifPresent(aid -> {
-
+            query.likeRight(VolunteerInfoEntity::getPids, getPidsByAgencyId(aid));
-            // 需要查询agency的pids:id，通过这个字符串去匹配志愿者的Pids字段来查询
-            String errorMsg = "【分页查询志愿者列表】失败";
-            CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(superiorAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-            if (agencyInfo == null) {
-               throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-            }
-
-            String pidsAndAgencyIdPath = agencyInfo.getPids().concat(":").concat(superiorAgencyId);
-            if (pidsAndAgencyIdPath.startsWith(":")) {
-                pidsAndAgencyIdPath = pidsAndAgencyIdPath.replaceFirst(":", "");
-            }
-
-            query.likeRight(VolunteerInfoEntity::getPids, pidsAndAgencyIdPath);
         });
 
         PageHelper.startPage(pageNo, pageSize);
@@ -391,17 +378,43 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     }
 
     @Override
-    public Integer getVolunteerCount(String customerId, String pidsPrefix) {
+    public Integer getVolunteerCount(String customerId, String agencyId) {
         LambdaQueryWrapper<VolunteerInfoEntity> query = new LambdaQueryWrapper<>();
 
         Optional.ofNullable(customerId).ifPresent((cId) -> {
             query.eq(VolunteerInfoEntity::getCustomerId, cId);
         });
 
-        Optional.ofNullable(pidsPrefix).ifPresent((pidsPrefixt) -> {
+        Optional.ofNullable(agencyId).ifPresent((aid) -> {
-            query.likeRight(VolunteerInfoEntity::getPids, pidsPrefixt);
+            query.likeRight(VolunteerInfoEntity::getPids, getPidsByAgencyId(aid));
         });
 
         return baseDao.selectCount(query);
     }
+
+    /**
+     * 使用agencyId,获取pids（agencyPids:agencyId）
+     * @param agencyId
+     * @return
+     */
+    private String getPidsByAgencyId(String agencyId) {
+        // 需要查询agency的pids:id，通过这个字符串去匹配志愿者的Pids字段来查询
+        String errorMsg = "【分页查询志愿者列表】失败";
+        CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(agencyId),
+                ServiceConstant.GOV_ORG_SERVER,
+                EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                errorMsg,
+                errorMsg);
+
+        if (agencyInfo == null) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+        }
+
+        String pidsAndAgencyIdPath = agencyInfo.getPids().concat(":").concat(agencyId);
+        if (pidsAndAgencyIdPath.startsWith(":")) {
+            pidsAndAgencyIdPath = pidsAndAgencyIdPath.replaceFirst(":", "");
+        }
+
+        return pidsAndAgencyIdPath;
+    }
 }

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

@@ -771,6 +771,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
 
         CustomerGridDTO gridInfo = baseDao.gridAgencyByGrid(customerGridFormDTO.getGridId());
+        if (null != gridInfo) {
+            redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
+        }
         /*CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
         if (null != gridInfo) {
             CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
@@ -779,7 +782,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
             redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         }*/
-        redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         return gridInfo;
     }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -259,6 +259,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @author zxc
 	 * @date 2021/12/10 10:31 上午
 	 */
-	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(List<String> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
+	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(List<SonOrgResultDTO> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -2924,6 +2924,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		if (CollectionUtils.isEmpty(sonOrgList.getData())){
 			return result;
 		}
+		// 所有子级orgId，并构建全部数据
 		List<SonOrgResultDTO> orgIds = sonOrgList.getData();
 		for (SonOrgResultDTO o : orgIds) {
 			ProjectDistributionAnalysisRightDTO dto = new ProjectDistributionAnalysisRightDTO();
@@ -2932,7 +2933,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 		List<ProjectDistributionAnalysisRightDTO> dtos;
 		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
-			dtos = baseDao.selectProjectCountByOrg(orgIds.stream().map(m -> m.getOrgId()).collect(Collectors.toList()), formDTO.getStartDate(), formDTO.getEndDate());
+			dtos = baseDao.selectProjectCountByOrg(orgIds, formDTO.getStartDate(),formDTO.getEndDate());
 		}else {
 			Result<List<ProjectDistributionAnalysisRightDTO>> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO);
 			if (!projectCountByGrid.success()){

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -470,17 +470,15 @@
 
     <!-- 查询组织下的项目数 -->
     <select id="selectProjectCountByOrg" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
+        <foreach collection="orgIds" item="o" separator=" UNION ALL ">
             SELECT
-            AGENCY_ID AS orgId,
+                #{o.orgId} AS orgId,
                 COUNT(ID) AS count
             FROM project
             WHERE DEL_FLAG = '0'
-            AND AGENCY_ID IN (
+                AND ORG_ID_PATH LIKE CONCAT(#{o.pids},':',#{o.orgId},'%')
-                <foreach collection="orgIds" item="o" separator=",">
-                    #{o}
-                </foreach>)
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
-        GROUP BY AGENCY_ID
+        </foreach>
     </select>
 </mapper>

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

@@ -103,7 +103,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
         String vcErrorMsg = "【志愿者分布】查询志愿者总数出错";
         VolunteerCommonFormDTO volunteerCountForm = new VolunteerCommonFormDTO();
         volunteerCountForm.setCustomerId(customerId);
-        volunteerCountForm.setSuperiorAgencyId(agencyId);
+        volunteerCountForm.setAgencyId(agencyId);
         Integer volunteerCount = getResultDataOrThrowsException(epmetHeartOpenFeignClient.getVolunteerCount(volunteerCountForm),
                 ServiceConstant.EPMET_HEART_SERVER,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
@@ -237,7 +237,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
     private List<PageVolunteerInfoResultDTO> listVolunteersByPage(String customerId, String agencyId, Integer pageNo, Integer pageSize) {
         VolunteerCommonFormDTO volunteerForm = new VolunteerCommonFormDTO();
         volunteerForm.setCustomerId(customerId);
-        volunteerForm.setSuperiorAgencyId(agencyId);
+        volunteerForm.setAgencyId(agencyId);
         volunteerForm.setPageNo(pageNo);
         volunteerForm.setPageSize(pageSize);