From 869914474325c50f66c44394938a2af5f5afe576 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 20 Jul 2021 16:35:48 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=BF=97=E6=84=BF=E8=80=85=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20bug=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 719cc9f7 --- .../epdc/dto/result/EpdcAppVolunteerRankDTO.java | 15 +-------------- .../epdc/service/impl/AppUserServiceImpl.java | 1 - .../epdc/modules/feign/UserInfoFeignClient.java | 2 +- .../modules/volunteer/dao/VolunteerRankDao.java | 3 ++- .../mapper/volunteer/VolunteerRankDao.xml | 2 +- .../v2/EpdcCompleteVolunteerInfoV2FormDTO.java | 2 +- 6 files changed, 6 insertions(+), 19 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java index fdc0f5d9..d589c4f9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java @@ -63,19 +63,6 @@ public class EpdcAppVolunteerRankDTO implements Serializable { */ private Integer participationNum; - /** - * 志愿者部门ID - */ - private String volunteerDeptId; - /** - * 志愿者公益积分 - */ - private Integer volunteerPoints; - /** - * 志愿公益累计积分 - */ - private Integer volunteerPointsTotal; - -} +} \ No newline at end of file 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 ee7c3441..ea660c1b 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 @@ -948,7 +948,6 @@ public class AppUserServiceImpl implements AppUserService { dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId()); - dto.setVolunteerDeptId(volunteerInfoDTO.getData().getVolunteerDeptId()); // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证 if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) { dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo()); diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java index 2d0d21b1..7ac953bb 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java @@ -107,7 +107,7 @@ public interface UserInfoFeignClient { * @Param [formDTO] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - @PostMapping(value = "app-user/volunteerinfo/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "app-user/user/handleVolunteerPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result handleVolunteerPoints(EpdcVolunteerPointsFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java index 19dd1499..d1b41fad 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppVolunteerRankFormDTO; import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity; import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -38,7 +39,7 @@ public interface VolunteerRankDao extends BaseDao { * @Author wanggongfeng * @return */ - List leaderboard(EpdcAppVolunteerRankFormDTO formDto); + List leaderboard(@Param("formDto") EpdcAppVolunteerRankFormDTO formDto); /** * @Description 清空排行榜数据 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml index 5757e5da..722af5f7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml @@ -37,7 +37,7 @@ order by VOLUNTEER_POINTS desc - LIMIT #{pageIndex},#{pageSize} + LIMIT #{formDto.pageIndex},#{formDto.pageSize} delete from epdc_volunteer_rank diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java index 51a92554..c9e9b274 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java @@ -127,7 +127,7 @@ public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable { /** * 志愿者部门 */ - private String volunteerDeptId; + private String volunteerDept; }