Merge remote-tracking branch 'origin/origin/volunteer_team'

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java

@@ -180,5 +180,17 @@ public class ApiVolunteerRankController {
         return appVolunteerRankService.joinTeam(dto);
     }
 
+    /**
+    * @describe: 小程序-根据名称获取所有志愿团队列表
+    * @author wangtong
+    * @date 2021/12/6 10:55
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getAllTeamListByName")
+    public Result getAllTeamListByName( VolunteerUnionFormDTO dto){
+        return appVolunteerRankService.getAllTeamListByName(dto);
+    }
+
 
 }

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

@@ -224,4 +224,14 @@ public interface ActInfoFeignClient {
     */
     @GetMapping(value ="heart/volunteerteam/selectTeamNameByIds", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result selectTeamNameByIds(VolunteerUnionFormDTO teamDto);
+
+    /**
+    * @describe: 小程序-根据名称获取所有志愿团队列表
+    * @author wangtong
+    * @date 2021/12/6 10:56
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping(value ="heart/volunteerteam/getAllTeamListByName", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getAllTeamListByName(VolunteerUnionFormDTO dto);
 }

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

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

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

@@ -152,4 +152,13 @@ public interface AppVolunteerRankService {
      * @Date 09:57 2021-12-01
      **/
     Result getVolunteerUnionActDetail(String id);
+
+    /**
+    * @describe: 小程序-根据名称获取所有志愿团队列表
+    * @author wangtong
+    * @date 2021/12/6 10:56
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result getAllTeamListByName(VolunteerUnionFormDTO dto);
 }

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

@@ -953,6 +953,7 @@ public class AppUserServiceImpl implements AppUserService {
                 dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce());
                 dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId());
                 dto.setVolunteerDeptId(volunteerInfoDTO.getData().getVolunteerDeptId());
+                dto.setTeamIds(volunteerInfoDTO.getData().getTeamIds());
                 //获取团队名称
                 if(!CollectionUtils.isEmpty(volunteerInfoDTO.getData().getTeamIds())){
                     log.info("prepareCompleteUserInfo-volunteerInfoDTO:"+volunteerInfoDTO);

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

@@ -150,4 +150,9 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
     public Result getVolunteerUnionActDetail(String id) {
         return actInfoFeignClient.getVolunteerUnionActDetail(id);
     }
+
+    @Override
+    public Result getAllTeamListByName(VolunteerUnionFormDTO dto) {
+        return actInfoFeignClient.getAllTeamListByName(dto);
+    }
 }

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

@@ -140,4 +140,28 @@ public class VolunteerTeamController {
         return volunteerTeamService.selectTeamNameByIds(dto);
     }
 
+    /**
+     * @describe: 小程序-根据名称获取所有志愿团队列表
+     * @author wangtong
+     * @date 2021/11/22 14:45
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("getAllTeamListByName")
+    public Result getAllTeamListByName(@RequestBody VolunteerUnionFormDTO dto){
+        return volunteerTeamService.getAllTeamListByName(dto);
+    }
+
+    /**
+    * @describe: 后台管理-根据名称获取所有志愿团队列表
+    * @author wangtong
+    * @date 2021/12/6 16:59
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getSysAllTeamListByName")
+    public Result getSysAllTeamListByName(VolunteerUnionFormDTO dto){
+        return volunteerTeamService.getAllTeamListByName(dto);
+    }
+
 }

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

@@ -73,4 +73,13 @@ public interface VolunteerTeamDao extends BaseDao<VolunteerTeamEntity> {
     * @return java.util.List<java.lang.String>
     */
     List<String> selectTeamNameByIds(VolunteerUnionFormDTO dto);
+
+    /**
+    * @describe: 小程序-根据名称获取所有志愿团队列表
+    * @author wangtong
+    * @date 2021/12/6 10:42
+    * @params [dto]
+    * @return java.util.List<com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamEntity>
+    */
+    List<VolunteerTeamEntity> getAllTeamListByName(VolunteerUnionFormDTO dto);
 }

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

@@ -133,4 +133,13 @@ public interface VolunteerTeamService extends BaseService<VolunteerTeamEntity> {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     Result selectTeamNameByIds(VolunteerUnionFormDTO dto);
+
+    /**
+    * @describe: 小程序-根据名称获取所有志愿团队列表
+    * @author wangtong
+    * @date 2021/12/6 10:41
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result getAllTeamListByName(VolunteerUnionFormDTO dto);
 }

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

@@ -181,6 +181,10 @@ public class VolunteerTeamServiceImpl extends BaseServiceImpl<VolunteerTeamDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-
+    @Override
+    public Result getAllTeamListByName(VolunteerUnionFormDTO dto) {
+        List<VolunteerTeamEntity> list = baseDao.getAllTeamListByName(dto);
+        return new Result().ok(list);
+    }
 
 }

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

@@ -65,6 +65,14 @@
                 #{teamId}
             </foreach>
     </select>
+    <select id="getAllTeamListByName" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamEntity">
+        select * from epdc_volunteer_team
+        where DEL_FLAG='0'
+            <if test="teamName != null and teamName != ''">
+                and TEAM_NAME like '%${teamName}%'
+            </if>
+        order by sort asc
+    </select>
 
 
 </mapper>

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

@@ -238,4 +238,9 @@ public class VolunteerInfoDTO implements Serializable {
      * 志愿团队id
      */
     private List<String> teamIds;
+
+    /**
+     * 后台管理-志愿团队id
+     */
+    private List<String> teamIdList;
 }

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

@@ -42,4 +42,9 @@ public class VolunteerUnionFormDTO implements Serializable {
      */
     private List<String> teamIds;
 
+    /**
+     *团队名称
+     */
+    private String teamName;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 移动端完善用户信息 v2接口
@@ -134,5 +135,10 @@ public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable {
      */
     private String teamId;
 
+    /**
+     * 团队id
+     */
+    private List<String> teamIdList;
+
 }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java

@@ -133,6 +133,7 @@ public class VolunteerInfoController {
         dto.setVolunteerOrder(formDto.getVolunteerOrder());
         dto.setId(formDto.getId());
         dto.setTagId(formDto.getTagId());
+        dto.setTeamIdList(formDto.getTeamIdList());
         volunteerInfoService.update(dto);
         return new Result();
     }

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

@@ -91,4 +91,22 @@ public interface VlounteerTeamRealationDao extends BaseDao<VlounteerTeamRealatio
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     List<VolunteerInfoDTO> selectVolunteerByTeamId(VolunteerUnionFormDTO dto);
+
+    /**
+    * @describe: 通过志愿者id获取信息
+    * @author wangtong
+    * @date 2021/12/6 17:54
+    * @params [volunteerId]
+    * @return java.util.List<com.elink.esua.epdc.entity.VlounteerTeamRealationEntity>
+    */
+    List<VlounteerTeamRealationEntity> selectByVolunteerId(@Param("volunteerId") String volunteerId);
+
+    /**
+    * @describe: 查询志愿者下的所有团队id
+    * @author wangtong
+    * @date 2021/12/6 18:12
+    * @params [volunteerId]
+    * @return java.util.List<java.lang.String>
+    */
+    List<String> selectIdsByVoId(@Param("volunteerId") String volunteerId);
 }

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

@@ -45,10 +45,12 @@ 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;
 import com.elink.esua.epdc.service.UserTagRelationService;
+import com.elink.esua.epdc.service.VlounteerTeamRealationService;
 import com.elink.esua.epdc.service.VolunteerInfoService;
 import com.elink.esua.epdc.service.VolunteerTagRelationService;
 import lombok.extern.slf4j.Slf4j;
@@ -84,6 +86,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     @Autowired
     private VlounteerTeamRealationDao vlounteerTeamRealationDao;
 
+    @Autowired
+    private VlounteerTeamRealationService vlounteerTeamRealationService;
+
     /**
      * 根据查询条件，返回首页 志愿者信息列表
      *
@@ -120,7 +125,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      */
     @Override
     public VolunteerInfoDTO getVolunteerDetail(String id) {
-        return baseDao.getVolunteerDetail(id);
+        VolunteerInfoDTO result = baseDao.getVolunteerDetail(id);
+        result.setTeamIdList(vlounteerTeamRealationDao.selectIdsByVoId(result.getId()));
+        return result;
     }
 
     @Override
@@ -172,6 +179,39 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         tagDto.setVolunteerId(dto.getId());
         tagDto.setTagId(dto.getTagId());
         volunteerTagRelationService.insertOrUpdateVolunteerTag(tagDto);
+
+        //更新志愿团队信息
+            //查询已加入的团队
+        List<VlounteerTeamRealationEntity> havedInfo = vlounteerTeamRealationDao.selectByVolunteerId(entity.getId());
+            //删除未选中的团队
+        for(VlounteerTeamRealationEntity have : havedInfo){
+            Boolean isHave = false;
+            for(String teamId : dto.getTeamIdList()){
+                if(have.getTeamId().equals(teamId)){
+                    isHave = true;
+                    break;
+                }
+            }
+            if(!isHave){
+                vlounteerTeamRealationDao.deleteById(have.getId());
+            }
+        }
+            //  新增录入的团队
+        for(String teamId : dto.getTeamIdList()){
+            Boolean isHave = false;
+            for(VlounteerTeamRealationEntity have : havedInfo){
+                if(have.getTeamId().equals(teamId)){
+                    isHave = true;
+                    break;
+                }
+            }
+            if(!isHave){
+                VlounteerTeamRealationEntity newEntity = new VlounteerTeamRealationEntity();
+                newEntity.setTeamId(teamId);
+                newEntity.setVolunteerId(entity.getId());
+                vlounteerTeamRealationDao.insert(newEntity);
+            }
+        }
     }
 
     @Override
@@ -465,7 +505,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());
@@ -475,15 +515,39 @@ 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) {
+        //查询已加入的团队
+        List<VlounteerTeamRealationEntity> havedInfo = vlounteerTeamRealationDao.selectByVolunteerId(volunteerEntity.getId());
+        //删除未选中的团队
+        for(VlounteerTeamRealationEntity have : havedInfo){
+            Boolean isHave = false;
+            for(String teamId : dto.getTeamIdList()){
+                if(have.getTeamId().equals(teamId)){
+                    isHave = true;
+                    break;
+                }
+            }
+            if(!isHave){
+                vlounteerTeamRealationDao.deleteById(have.getId());
+            }
+        }
+        //  新增录入的团队
+        for(String teamId : dto.getTeamIdList()){
+            Boolean isHave = false;
+            for(VlounteerTeamRealationEntity have : havedInfo){
+                if(have.getTeamId().equals(teamId)){
+                    isHave = true;
+                    break;
+                }
+            }
+            if(!isHave){
+                VlounteerTeamRealationEntity newEntity = new VlounteerTeamRealationEntity();
+                newEntity.setTeamId(teamId);
+                newEntity.setVolunteerId(volunteerEntity.getId());
+                vlounteerTeamRealationDao.insert(newEntity);
+            }
+        }
+    }
 
     @Override
     public Result updateKindnessTime(EpdcVolunteerKindnessTimeUpdateFormDTO formDto) {

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

@@ -78,6 +78,17 @@
         select * from epdc_vlounteer_team_realation where TEAM_ID=#{id}
             AND DEL_FLAG='0'
     </select>
+    <select id="selectByVolunteerId" resultType="com.elink.esua.epdc.entity.VlounteerTeamRealationEntity">
+        select * from epdc_vlounteer_team_realation
+        where del_flag='0'
+              and VOLUNTEER_ID=#{volunteerId}
+    </select>
+    <select id="selectIdsByVoId" resultType="java.lang.String">
+        select TEAM_ID
+        from epdc_vlounteer_team_realation
+        where del_flag='0'
+              and VOLUNTEER_ID=#{volunteerId}
+    </select>
 
 
 </mapper>