From ba4d50052a1c36590bc58b1fb4d0e067b6e85455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 20 Jul 2020 13:33:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E5=8F=8B=E5=A4=9A=E5=A4=9A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E6=B3=A8=E5=86=8C=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiAppUserController.java | 2 +- .../com/elink/esua/epdc/feign/UserFeignClient.java | 2 +- .../epdc/feign/fallback/UserFeignClientFallback.java | 2 +- .../com/elink/esua/epdc/service/AppUserService.java | 2 +- .../esua/epdc/service/impl/AppUserServiceImpl.java | 2 +- .../controller/EpdcAppVolunteerInfoController.java | 3 ++- .../java/com/elink/esua/epdc/dao/VolunteerInfoDao.java | 10 ++++++++++ .../elink/esua/epdc/service/VolunteerInfoService.java | 3 ++- .../epdc/service/impl/VolunteerInfoServiceImpl.java | 8 ++++++-- .../src/main/resources/mapper/VolunteerInfoDao.xml | 10 ++++++++++ 10 files changed, 35 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 36b2c6ae..1ba2b2d6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/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> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + public Result volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { ValidatorUtils.validateEntity(dto); return appUserService.listVolunteer(tokenDto, dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index e44ec2b5..431263c6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/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> listVolunteer(EpdcAppVolunteerListFormDTO dto); + Result listVolunteer(EpdcAppVolunteerListFormDTO dto); /** * 志愿者添加 V2接口 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 0d88b231..2b22fc41 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/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> listVolunteer(EpdcAppVolunteerListFormDTO dto) { + public Result listVolunteer(EpdcAppVolunteerListFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteer", dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index ef236947..15e36ba7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/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> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto); + Result listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto); /** * 志愿者认证 V2接口 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 2c959738..75c0ae94 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/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> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + public Result listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { dto.setGridId(tokenDto.getGridId()); return userFeignClient.listVolunteer(dto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java index f35f6536..ea87919e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java +++ b/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> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) { + public Result volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) { return volunteerInfoService.listVolunteer(dto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java index b537fc28..3d703d28 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java +++ b/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 { * @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(); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java index cb39bb71..a8a88de3 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java +++ b/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 { * @Author zhangyong * @Date 15:33 2020-05-18 **/ - Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); + Result listVolunteer(EpdcAppVolunteerListFormDTO dto); /** * 插入一条志愿者数据 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java index 90e65549..eebf6430 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java +++ b/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> listVolunteer(EpdcAppVolunteerListFormDTO dto) { + public Result listVolunteer(EpdcAppVolunteerListFormDTO dto) { int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); dto.setPageIndex(pageIndex); List 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 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index a715346b..ce7a0154 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -225,6 +225,16 @@ LIMIT #{pageIndex},#{pageSize} + + UPDATE epdc_volunteer_info SET