志愿者详情调整

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author work@yujt.net.cn
@@ -107,5 +108,10 @@ public class EpdcCompleteUserInfoDTO implements Serializable {
     /**
      * 志愿团队id
      */
-    private String teamId;
+    private List<String> teamIds;
+
+    /**
+     * 已加入的志愿团队名称
+     */
+    private List<String> teamNames;
 }

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

@@ -191,4 +191,14 @@ public interface ActInfoFeignClient {
      */
     @GetMapping(value ="heart/volunteerteam/getAppTeamDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result getAppTeamDetail(VolunteerUnionFormDTO formDto);
+
+    /**
+    * @describe: 获取团队名称
+    * @author wangtong
+    * @date 2021/11/25 15:43
+    * @params [teamDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping(value ="heart/volunteerteam/selectTeamNameByIds", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result selectTeamNameByIds(VolunteerUnionFormDTO teamDto);
 }

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

@@ -107,4 +107,9 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getAppTeamDetail", formDto);
     }
 
+    @Override
+    public Result selectTeamNameByIds(VolunteerUnionFormDTO teamDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "selectTeamNameByIds", teamDto);
+    }
+
 }

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

@@ -8,6 +8,7 @@ import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.elink.esua.epdc.async.GroupTask;
 import com.elink.esua.epdc.async.PartyGroupTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
@@ -119,6 +120,9 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private PointsFeignClient pointsFeignClient;
 
+    @Autowired
+    private ActInfoFeignClient actInfoFeignClient;
+
     //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png";
     private static String USER_FACE = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png";
 
@@ -949,7 +953,17 @@ public class AppUserServiceImpl implements AppUserService {
                 dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce());
                 dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId());
                 dto.setVolunteerDeptId(volunteerInfoDTO.getData().getVolunteerDeptId());
-                dto.setTeamId(volunteerInfoDTO.getData().getTeamId());
+                //获取团队名称
+                if(!CollectionUtils.isEmpty(volunteerInfoDTO.getData().getTeamIds())){
+                    log.info("prepareCompleteUserInfo-volunteerInfoDTO:"+volunteerInfoDTO);
+                    VolunteerUnionFormDTO teamDto = new VolunteerUnionFormDTO();
+                    teamDto.setTeamIds(volunteerInfoDTO.getData().getTeamIds());
+                    Result<List<String>> teamResult = actInfoFeignClient.selectTeamNameByIds(teamDto);
+                    log.info("prepareCompleteUserInfo-teamResult:"+teamResult);
+                    if (teamResult.success() && null != teamResult.getData()) {
+                        dto.setTeamNames(teamResult.getData());
+                    }
+                }
                 // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证
                 if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) {
                     dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo());

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerTeamController.java

@@ -128,4 +128,16 @@ public class VolunteerTeamController {
         return volunteerTeamService.getAppTeamDetail(dto);
     }
 
+    /**
+    * @describe: 获取团队名称
+    * @author wangtong
+    * @date 2021/11/25 15:45
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("selectTeamNameByIds")
+    public Result selectTeamNameByIds(@RequestBody VolunteerUnionFormDTO dto){
+        return volunteerTeamService.selectTeamNameByIds(dto);
+    }
+
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerTeamDao.java

@@ -64,4 +64,13 @@ public interface VolunteerTeamDao extends BaseDao<VolunteerTeamEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     VolunteerDetailResultDTO getAppTeamDetail(VolunteerUnionFormDTO dto);
+
+    /**
+    * @describe: 获取团队名称
+    * @author wangtong
+    * @date 2021/11/25 15:46
+    * @params [dto]
+    * @return java.util.List<java.lang.String>
+    */
+    List<String> selectTeamNameByIds(VolunteerUnionFormDTO dto);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerTeamService.java

@@ -124,4 +124,13 @@ public interface VolunteerTeamService extends BaseService<VolunteerTeamEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getAppTeamDetail(VolunteerUnionFormDTO dto);
+
+    /**
+    * @describe: 获取团队名称
+    * @author wangtong
+    * @date 2021/11/25 15:49
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result selectTeamNameByIds(VolunteerUnionFormDTO dto);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerTeamServiceImpl.java

@@ -113,6 +113,13 @@ public class VolunteerTeamServiceImpl extends BaseServiceImpl<VolunteerTeamDao,
         return new Result().ok(result);
     }
 
+    @Override
+    public Result selectTeamNameByIds(VolunteerUnionFormDTO dto) {
+        log.info("selectTeamNameByIds-dto:"+dto);
+        List<String> teamNames = baseDao.selectTeamNameByIds(dto);
+        return new Result().ok(teamNames);
+    }
+
     @Override
     public List<VolunteerTeamDTO> list(Map<String, Object> params) {
         List<VolunteerTeamEntity> entityList = baseDao.selectList(getWrapper(params));

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -196,6 +196,7 @@
         and relation.USER_ID = #{userId}
         and relation.STATUS not in ('3','4')
         and actInfo.ID = relation.ACT_ID
+        left join epdc_volunteer_team vt on actInfo.TEAM_ID=vt.id
         WHERE actInfo.DEL_FLAG = '0'  and actInfo.ACT_STATUS = '1'
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
@@ -207,7 +208,7 @@
             AND actInfo.TEAM_ID = #{teamId}
         </if>
         <if test='sponsor != null and sponsor != "" '>
-            AND actInfo.SPONSOR like concat('%', #{sponsor}, '%')
+            AND vt.TEAM_NAME like concat('%', #{sponsor}, '%')
         </if>
         <if test='actType != null and actType != "" and actType == "1"'>
             <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerTeamDao.xml

@@ -57,6 +57,14 @@
         where DEL_FLAG='0'
         and id=#{id}
     </select>
+    <select id="selectTeamNameByIds" resultType="java.lang.String">
+        select TEAM_NAME
+        from epdc_volunteer_team
+        where id in
+            <foreach collection="teamIds" index="index" item="teamId" open="(" separator="," close=")">
+                #{teamId}
+            </foreach>
+    </select>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java

@@ -22,6 +22,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -236,5 +237,5 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 志愿团队id
      */
-    private String teamId;
+    private List<String> teamIds;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerUnionFormDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @program: esua-epdc
@@ -36,4 +37,9 @@ public class VolunteerUnionFormDTO implements Serializable {
      */
     private String userId;
 
+    /**
+     * 志愿团队id
+     */
+    private List<String> teamIds;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java

@@ -186,4 +186,13 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
      */
     List<VolunteerInfoEntity> getUserListForVolunteerOrg(Map<String, Object> params);
+
+    /**
+    * @describe: 通过志愿者id查询所在的志愿团队id
+    * @author wangtong
+    * @date 2021/11/25 15:32
+    * @params [volunteerId]
+    * @return java.util.List<java.lang.String>
+    */
+    List<String> selectTeamIdsByVolunteerId(@Param("volunteerId") String volunteerId);
 }

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

@@ -99,7 +99,7 @@ public class VlounteerTeamRealationServiceImpl extends BaseServiceImpl<Vlounteer
         if(checkFlag != null){
             return new Result().error("此志愿者已加入该团队");
         }
-        baseDao.deleteByVolunteerId(dto.getVolunteerId());
+//        baseDao.deleteByVolunteerId(dto.getVolunteerId());
         VlounteerTeamRealationEntity entity = new VlounteerTeamRealationEntity();
         entity.setTeamId(dto.getTeamId());
         entity.setVolunteerId(dto.getVolunteerId());

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

@@ -45,7 +45,6 @@ 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.VlounteerTeamRealationEntity;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
@@ -341,7 +340,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      **/
     @Override
     public Result<VolunteerInfoDTO> getVolunteerInfoDTOByUserId(String userId) {
-        return new Result<VolunteerInfoDTO>().ok(baseDao.selectOneVolunteerInfoDTO(userId));
+        VolunteerInfoDTO resutlt = baseDao.selectOneVolunteerInfoDTO(userId);
+        resutlt.setTeamIds(baseDao.selectTeamIdsByVolunteerId(resutlt.getId()));
+        return new Result<VolunteerInfoDTO>().ok(resutlt);
     }
 
     /**
@@ -464,7 +465,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             userTagRelationService.addUserTagRelation(volunteerEntity.getUserId(), UserTagEnum.VOLUNTEER.value());
         }
         //更新志愿者的志愿团队信息
-        updateVolunteerTeam(volunteerEntity,formDTO);
+//        updateVolunteerTeam(volunteerEntity,formDTO);
         // 更新志愿者标签
         VolunteerTagRelationDTO tagDto = new VolunteerTagRelationDTO();
         tagDto.setVolunteerId(volunteerEntity.getId());
@@ -474,15 +475,15 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result().ok(NumConstant.ONE);
     }
 
-    private void updateVolunteerTeam(VolunteerInfoEntity volunteerEntity, EpdcCompleteVolunteerInfoV2FormDTO dto) {
-        vlounteerTeamRealationDao.deleteByVolunteerId(volunteerEntity.getId());
-        if(StringUtils.isNotBlank(dto.getTeamId())){
-            VlounteerTeamRealationEntity entity = new VlounteerTeamRealationEntity();
-            entity.setVolunteerId(volunteerEntity.getId());
-            entity.setTeamId(dto.getTeamId());
-            vlounteerTeamRealationDao.insert(entity);
-        }
-    }
+//    private void updateVolunteerTeam(VolunteerInfoEntity volunteerEntity, EpdcCompleteVolunteerInfoV2FormDTO dto) {
+//        vlounteerTeamRealationDao.deleteByVolunteerId(volunteerEntity.getId());
+//        if(StringUtils.isNotBlank(dto.getTeamId())){
+//            VlounteerTeamRealationEntity entity = new VlounteerTeamRealationEntity();
+//            entity.setVolunteerId(volunteerEntity.getId());
+//            entity.setTeamId(dto.getTeamId());
+//            vlounteerTeamRealationDao.insert(entity);
+//        }
+//    }
 
     @Override
     public Result updateKindnessTime(EpdcVolunteerKindnessTimeUpdateFormDTO formDto) {

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

@@ -216,11 +216,9 @@
     <select id="selectOneVolunteerInfoDTO" parameterType="java.lang.String"
             resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
          select m.*,
-               vt.tag_id,
-			   tv.TEAM_ID
+               vt.tag_id
          from epdc_volunteer_info m
             left join epdc_volunteer_tag_relation vt on vt.VOLUNTEER_ID = m.id and vt.del_flag = '0'
-            left join epdc_vlounteer_team_realation tv on tv.VOLUNTEER_ID= m.id and tv.DEL_FLAG='0'
             where m.DEL_FLAG='0'
             and m.USER_ID=#{userId}
     </select>
@@ -354,4 +352,10 @@
             </if>
         order by vi.CREATED_TIME desc
     </select>
+    <select id="selectTeamIdsByVolunteerId" resultType="java.lang.String">
+        select team_id
+        from epdc_vlounteer_team_realation
+        where VOLUNTEER_ID = #{volunteerId}
+        and DEL_FLAG='0'
+    </select>
 </mapper>