志友多多列表接口增加志愿者注册数字段

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -336,7 +336,7 @@ public class ApiAppUserController {
      * @Date 15:33 2020-05-18
      **/
     @GetMapping("volunteer/list")
-    public Result<List<EpdcAppVolunteerListResultDTO>> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
+    public Result<EpdcAppVolunteerListCountResultDTO> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
         return appUserService.listVolunteer(tokenDto, dto);
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -375,7 +375,7 @@ public interface UserFeignClient {
      * @Date 15:33 2020-05-18
      **/
     @GetMapping("app-user/epdc-app/volunteerinfo/list")
-    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto);
+    Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto);
 
     /**
      * 志愿者添加 V2接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -181,7 +181,7 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteer", dto);
     }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -266,7 +266,7 @@ public interface AppUserService {
      * @Author zhangyong
      * @Date 15:33 2020-05-18
      **/
-    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto);
+    Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto);
 
     /**
      * 志愿者认证 V2接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1443,7 +1443,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
+    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
         dto.setGridId(tokenDto.getGridId());
         return userFeignClient.listVolunteer(dto);
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java

@@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.service.VolunteerInfoService;
@@ -71,7 +72,7 @@ public class EpdcAppVolunteerInfoController {
      * @Date 15:08 2020-05-18
      **/
     @GetMapping("list")
-    public Result<List<EpdcAppVolunteerListResultDTO>> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) {
+    public Result<EpdcAppVolunteerListCountResultDTO> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) {
         return volunteerInfoService.listVolunteer(dto);
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java

@@ -149,4 +149,14 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @Date 19:52 2020-05-27
      **/
     void updateVolunteerAauthentication(EpdcCompleteVolunteerInfoV2FormDTO formDTO);
+
+
+    /***
+     * 志愿者数量
+     * @param
+     * @return java.lang.Integer
+     * @author qushutong
+     * @date 2020/7/20 10:53
+     */
+    Integer selectListVolunteerCount();
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
@@ -215,7 +216,7 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @Author zhangyong
      * @Date 15:33 2020-05-18
      **/
-    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto);
+    Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto);
 
     /**
      * 插入一条志愿者数据

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -43,6 +43,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
@@ -391,11 +392,14 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     }
 
     @Override
-    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
         int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
         dto.setPageIndex(pageIndex);
         List<EpdcAppVolunteerListResultDTO> data = baseDao.selectListVolunteer(dto);
-        return new Result().ok(data);
+        EpdcAppVolunteerListCountResultDTO volunteerListCountResultDTO = new EpdcAppVolunteerListCountResultDTO();
+        volunteerListCountResultDTO.setCount(baseDao.selectListVolunteerCount());
+        volunteerListCountResultDTO.setVolunteerList(data);
+        return new Result().ok(volunteerListCountResultDTO);
     }
 
     @Override

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -225,6 +225,16 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
+    <select id="selectListVolunteerCount" resultType="int">
+        SELECT
+            count (*) as volunteerCount
+        FROM
+            epdc_volunteer_info v
+        WHERE
+          v.DEL_FLAG = 0
+          AND v.AUDIT_STATUS != 2
+    </select>
+
     <update id="updateVolunteerAauthentication" parameterType="com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO">
         UPDATE epdc_volunteer_info
         SET