From 8f95a569f97c6cc32d7686e6035ed7f96350eade Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 23 Nov 2021 15:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/AppVolunteerRankServiceImpl.java | 2 ++ .../com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java | 2 +- .../volunteer/service/impl/VolunteerTeamServiceImpl.java | 3 +++ .../src/main/resources/mapper/activity/ActInfoDao.xml | 2 +- .../esua/epdc/controller/VlounteerTeamRealationController.java | 2 +- .../epdc/service/impl/VlounteerTeamRealationServiceImpl.java | 3 +++ 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java index 7c9b9c8a..5670a193 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java @@ -124,6 +124,8 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService { return new Result().error("获取用户信息失败"); } dto.setUserId(userDetail.getUserId()); + log.info("getAppTeamDetail-userDetail"+userDetail); + log.info("getAppTeamDetail-dto"+dto); return actInfoFeignClient.getAppTeamDetail(dto); } 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 4800acc5..f3236812 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 @@ -119,6 +119,6 @@ public interface UserInfoFeignClient { * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - @GetMapping(value = "app-user/vlounteerteamrealation/getVolunteerWithTeamState", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "app-user/vlounteerteamrealation/getVolunteerWithTeamState", consumes = MediaType.APPLICATION_JSON_VALUE) Result getVolunteerWithTeamState(VolunteerUnionFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerTeamServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerTeamServiceImpl.java index 3e764345..26d4dcd9 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerTeamServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerTeamServiceImpl.java @@ -34,6 +34,7 @@ import com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamEntity; import com.elink.esua.epdc.modules.volunteer.redis.VolunteerTeamRedis; import com.elink.esua.epdc.modules.volunteer.service.VolunteerTeamService; import com.elink.esua.epdc.volunteer.VolunteerTeamDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,6 +50,7 @@ import java.util.Map; * @author qu qu@elink-cn.com * @since v1.0.0 2021-11-16 */ +@Slf4j @Service public class VolunteerTeamServiceImpl extends BaseServiceImpl implements VolunteerTeamService { @@ -90,6 +92,7 @@ public class VolunteerTeamServiceImpl extends BaseServiceImpl volunteerResult = userInfoFeignClient.getVolunteerWithTeamState(dto); diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index e2d86583..a7e7745f 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -186,7 +186,7 @@ ( SELECT i.ID, i.TITLE, i.HEAD_PIC, i.ACT_START_TIME, i.ACT_END_TIME, i.PUBLISH_TIME, i.ACT_ADDRESS, i.ACT_QUOTA, i.CLOCK_NUM, i.SIGNUP_END_TIME, i.CREATED_TIME, i.ACT_QUOTA_CATEGORY, - i.TOP_FLAG, i.DEL_FLAG, i.ACT_STATUS, i.SPONSOR, IFNULL(SUM(p.ACT_PERIOD_SIGNUP_NUM), 0) ACT_PERIOD_SIGNUP_NUM, i.SIGNUP_NUM + i.TOP_FLAG, i.DEL_FLAG, i.ACT_STATUS, i.SPONSOR, IFNULL(SUM(p.ACT_PERIOD_SIGNUP_NUM), 0) ACT_PERIOD_SIGNUP_NUM, i.SIGNUP_NUM,i.TEAM_ID FROM epdc_act_info i LEFT JOIN epdc_act_period p ON i.ID = p.ACT_ID AND p.DEL_FLAG = '0' diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java index 472b659c..f0bc0372 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java @@ -112,7 +112,7 @@ public class VlounteerTeamRealationController { * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result */ - @GetMapping("getVolunteerWithTeamState") + @PostMapping("getVolunteerWithTeamState") public Result getVolunteerWithTeamState(@RequestBody VolunteerUnionFormDTO dto) { return vlounteerTeamRealationService.getVolunteerWithTeamState(dto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java index a82ff447..0a3a5db3 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.entity.VlounteerTeamRealationEntity; import com.elink.esua.epdc.entity.VolunteerInfoEntity; import com.elink.esua.epdc.redis.VlounteerTeamRealationRedis; import com.elink.esua.epdc.service.VlounteerTeamRealationService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,6 +47,7 @@ import java.util.Map; * @author qu qu@elink-cn.com * @since v1.0.0 2021-11-16 */ +@Slf4j @Service public class VlounteerTeamRealationServiceImpl extends BaseServiceImpl implements VlounteerTeamRealationService { @@ -78,6 +80,7 @@ public class VlounteerTeamRealationServiceImpl extends BaseServiceImpl