合并dev代码，并且解决冲突

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -74,7 +74,7 @@ public interface EpmetHeartOpenFeignClient {
      * @return
      */
     @PostMapping("/heart/residemand/autoevaluate")
-    Result AutoEvaluateDemand(@RequestBody AutoEvaluateDemandFormDTO formDTO);
+    Result autoEvaluateDemand(@RequestBody AutoEvaluateDemandFormDTO formDTO);
 
     /**
      * 查询志愿者数量

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -68,7 +68,7 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
      * @return
      */
     @Override
-    public Result AutoEvaluateDemand(AutoEvaluateDemandFormDTO formDTO) {
+    public Result autoEvaluateDemand(AutoEvaluateDemandFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "autoEvaluate",formDTO);
     }
 

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

@@ -153,10 +153,10 @@ public class ResiVolunteerController {
      */
     @PostMapping("count")
     public Result<Integer> getVolunteerCount(@RequestBody VolunteerCommonFormDTO input) {
-        ValidatorUtils.validateEntity(input, VolunteerCommonFormDTO.VolunteerPage.class);
         String customerId = input.getCustomerId();
+        String pidsPrefix = input.getSuperiorAgencyId();
 
-        Integer volunteerCount = volunteerInfoService.getVolunteerCount(customerId);
+        Integer volunteerCount = volunteerInfoService.getVolunteerCount(customerId, pidsPrefix);
         return new Result<Integer>().ok(volunteerCount);
     }
 }

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

@@ -102,5 +102,5 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @param customerId
      * @return
      */
-    Integer getVolunteerCount(String customerId);
+    Integer getVolunteerCount(String customerId, String pidsPrefix);
 }

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

@@ -385,9 +385,17 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     }
 
     @Override
-    public Integer getVolunteerCount(String customerId) {
+    public Integer getVolunteerCount(String customerId, String pidsPrefix) {
         LambdaQueryWrapper<VolunteerInfoEntity> query = new LambdaQueryWrapper<>();
-        query.eq(VolunteerInfoEntity::getCustomerId, customerId);
+
+        Optional.ofNullable(customerId).ifPresent((cId) -> {
+            query.eq(VolunteerInfoEntity::getCustomerId, cId);
+        });
+
+        Optional.ofNullable(pidsPrefix).ifPresent((pidsPrefixt) -> {
+            query.likeRight(VolunteerInfoEntity::getPids, pidsPrefixt);
+        });
+
         return baseDao.selectCount(query);
     }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoEvaluateDemandTask.java

@@ -26,6 +26,6 @@ public class AutoEvaluateDemandTask implements ITask {
         if (StringUtils.isNotBlank(params)) {
             formDTO = JSON.parseObject(params, AutoEvaluateDemandFormDTO.class);
         }
-        Result result = heartOpenFeignClient.AutoEvaluateDemand(formDTO);
+        Result result = heartOpenFeignClient.autoEvaluateDemand(formDTO);
     }
 }

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

@@ -103,6 +103,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
         String vcErrorMsg = "【志愿者分布】查询志愿者总数出错";
         VolunteerCommonFormDTO volunteerCountForm = new VolunteerCommonFormDTO();
         volunteerCountForm.setCustomerId(customerId);
+        volunteerCountForm.setSuperiorAgencyId(agencyId);
         Integer volunteerCount = getResultDataOrThrowsException(epmetHeartOpenFeignClient.getVolunteerCount(volunteerCountForm),
                 ServiceConstant.EPMET_HEART_SERVER,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),