方法类型修改

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);
     }
 

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<com.elink.esua.epdc.volunteer.VolunteerDetailResultDTO>
     */
-    @GetMapping(value = "app-user/vlounteerteamrealation/getVolunteerWithTeamState", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "app-user/vlounteerteamrealation/getVolunteerWithTeamState", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<VolunteerDetailResultDTO> getVolunteerWithTeamState(VolunteerUnionFormDTO dto);
 }

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<VolunteerTeamDao, VolunteerTeamEntity> implements VolunteerTeamService {
 
@@ -90,6 +92,7 @@ public class VolunteerTeamServiceImpl extends BaseServiceImpl<VolunteerTeamDao,
 
     @Override
     public Result getAppTeamDetail(VolunteerUnionFormDTO dto) {
+        log.info("getAppTeamDetail-dto:"+dto);
         VolunteerDetailResultDTO result = baseDao.getAppTeamDetail(dto);
 
         Result<VolunteerDetailResultDTO> volunteerResult = userInfoFeignClient.getVolunteerWithTeamState(dto);

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'

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);
     }

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<VlounteerTeamRealationDao, VlounteerTeamRealationEntity> implements VlounteerTeamRealationService {
 
@@ -78,6 +80,7 @@ public class VlounteerTeamRealationServiceImpl extends BaseServiceImpl<Vlounteer
 
     @Override
     public Result getVolunteerWithTeamState(VolunteerUnionFormDTO dto) {
+        log.info("getVolunteerWithTeamState-dto:"+dto);
         VolunteerDetailResultDTO result = baseDao.getVolunteerWithTeamState(dto);
         return new Result().ok(result);
     }