新增 志愿者列表v2接口

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<EpdcAppVolunteerListCountResultDTO> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
+    public Result<List<EpdcAppVolunteerListResultDTO>> 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/controller/v2/ApiAppUserV2Controller.java

@@ -7,7 +7,9 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO;
 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.form.EpdcAppUserRegisterFormDTO;
 import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@@ -105,4 +107,18 @@ public class ApiAppUserV2Controller {
         return appUserService.volunteerV2Authenticate(tokenDto, formDto);
 
     }
+
+   /***
+    * 志愿者列表v2
+    * @param tokenDto
+    * @param dto
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO>
+    * @author qushutong
+    * @date 2020/7/23 13:31
+    */
+    @GetMapping("volunteer/"+ Constant.VERSION_CONTROL+"/list")
+    public Result<EpdcAppVolunteerListCountResultDTO> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return appUserService.listVolunteerV2(tokenDto, dto);
+    }
 }

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

@@ -367,6 +367,17 @@ public interface UserFeignClient {
     @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
 
+    /*
+     * 志愿者列表 v2
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:33 2020-05-18
+     **/
+    @GetMapping("app-user/epdc-app/volunteerinfo/V2/list")
+    Result<EpdcAppVolunteerListCountResultDTO> listVolunteerV2(EpdcAppVolunteerListFormDTO dto);
+
+
     /*
      * 志愿者列表
      * @param dto
@@ -375,7 +386,7 @@ public interface UserFeignClient {
      * @Date 15:33 2020-05-18
      **/
     @GetMapping("app-user/epdc-app/volunteerinfo/list")
-    Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto);
+    Result<List<EpdcAppVolunteerListResultDTO>> 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,10 +181,13 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteerV2(EpdcAppVolunteerListFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteerV2", dto);
+    }
+    @Override
+    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteer", dto);
     }
-
     @Override
     public Result<Integer> insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertV2VolunteerInfo", dto);

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

@@ -258,6 +258,17 @@ public interface AppUserService {
      */
     Result<String> getUserWxPhone(EpdcAppUserMaInfoFormDTO formDto);
 
+    /*
+     * 志愿者列表 v2
+     * @param tokenDto
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:33 2020-05-18
+     **/
+    Result<EpdcAppVolunteerListCountResultDTO> listVolunteerV2(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto);
+
+
     /*
      * 志愿者列表
      * @param tokenDto
@@ -266,7 +277,7 @@ public interface AppUserService {
      * @Author zhangyong
      * @Date 15:33 2020-05-18
      **/
-    Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto);
+    Result<List<EpdcAppVolunteerListResultDTO>> 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,13 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
+    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteerV2(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
+        dto.setGridId(tokenDto.getGridId());
+        return userFeignClient.listVolunteerV2(dto);
+    }
+
+    @Override
+    public Result<List<EpdcAppVolunteerListResultDTO>> 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

@@ -72,10 +72,11 @@ public class EpdcAppVolunteerInfoController {
      * @Date 15:08 2020-05-18
      **/
     @GetMapping("list")
-    public Result<EpdcAppVolunteerListCountResultDTO> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) {
+    public Result<List<EpdcAppVolunteerListResultDTO>> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) {
         return volunteerInfoService.listVolunteer(dto);
     }
 
+
     /**
      * 志愿者添加 V2接口
      *

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

@@ -0,0 +1,46 @@
+package com.elink.esua.epdc.controller.v2;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 对移动端开放
+ *
+ * @author wanggongfeng
+ * @date 2019/9/6 20:31
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "volunteerinfo"+Constant.VERSION_CONTROL)
+public class EpdcAppVolunteerInfoV2Controller {
+    @Autowired
+    private VolunteerInfoService volunteerInfoService;
+
+    /**
+     * 志愿者列表 v2
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:08 2020-05-18
+     **/
+    @GetMapping("list")
+    public Result<EpdcAppVolunteerListCountResultDTO> volunteerListV2(@RequestBody EpdcAppVolunteerListFormDTO dto) {
+        return volunteerInfoService.listVolunteerV2(dto);
+    }
+
+
+}

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

@@ -209,6 +209,16 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      */
     Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto);
 
+    /*
+     * 志愿者列表v2
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:33 2020-05-18
+     **/
+    Result<EpdcAppVolunteerListCountResultDTO> listVolunteerV2(EpdcAppVolunteerListFormDTO dto);
+
+
     /*
      * 志愿者列表
      * @param dto
@@ -216,7 +226,7 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @Author zhangyong
      * @Date 15:33 2020-05-18
      **/
-    Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto);
+    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto);
 
     /**
      * 插入一条志愿者数据

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

@@ -392,7 +392,14 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     }
 
     @Override
-    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+    public Result<List<EpdcAppVolunteerListResultDTO>> 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);
+    }
+    @Override
+    public Result<EpdcAppVolunteerListCountResultDTO> listVolunteerV2(EpdcAppVolunteerListFormDTO dto) {
         int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
         dto.setPageIndex(pageIndex);
         List<EpdcAppVolunteerListResultDTO> data = baseDao.selectListVolunteer(dto);
@@ -401,7 +408,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         volunteerListCountResultDTO.setVolunteerList(data);
         return new Result().ok(volunteerListCountResultDTO);
     }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<Integer> insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) {

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

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