小程序接口调整

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

@@ -103,4 +103,9 @@ public class EpdcCompleteUserInfoDTO implements Serializable {
      * 志愿者所属部门
      */
     private String volunteerDeptId;
+
+    /**
+     * 志愿团队id
+     */
+    private String teamId;
 }

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

@@ -273,6 +273,7 @@ public class ApiAppUserController {
     public Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(@LoginUser TokenDto tokenDto) {
         return appUserService.prepareCompleteUserInfo(tokenDto);
     }
+
     /**
      * 获取邀请记录
      *

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

@@ -93,15 +93,15 @@ public class ApiVolunteerRankController {
     }
 
     /**
-     * @describe: 查询所有志愿团队类别
+     * @describe: 小程序-查询所有志愿团队类别
      * @author wangtong
      * @date 2021/11/18 10:55
      * @params []
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping("getTeamTypeList")
-    public Result getTeamTypeList(){
+    public Result getTeamTypeList(VolunteerTeamFormDTO formDto){
-        return appVolunteerRankService.getTeamTypeList();
+        return appVolunteerRankService.getTeamTypeList(formDto);
     }
 
 

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.activity.result.*;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
+import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.dto.VolunteerUnionFormDTO;
 import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -169,7 +170,7 @@ public interface ActInfoFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     @GetMapping(value ="heart/volunteerteamtype/getTeamTypeList")
-    Result getTeamTypeList();
+    Result getTeamTypeList(VolunteerTeamFormDTO formDto);
 
     /**
      * @describe: 小程序-志愿团队-列表

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.activity.result.*;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.dto.VolunteerUnionFormDTO;
 import com.elink.esua.epdc.feign.ActInfoFeignClient;
 import org.springframework.stereotype.Component;
@@ -92,8 +93,8 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
     }
 
     @Override
-    public Result getTeamTypeList() {
+    public Result getTeamTypeList(VolunteerTeamFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getTeamTypeList");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getTeamTypeList",formDto);
     }
 
     @Override

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

@@ -94,7 +94,7 @@ public interface AppVolunteerRankService {
      * @params []
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
-    Result getTeamTypeList();
+    Result getTeamTypeList(VolunteerTeamFormDTO formDto);
 
     /**
      * @describe: 小程序-志愿团队-列表

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

@@ -949,6 +949,7 @@ 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 (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) {
                     dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo());

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

@@ -109,8 +109,8 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
     }
 
     @Override
-    public Result getTeamTypeList() {
+    public Result getTeamTypeList(VolunteerTeamFormDTO formDto) {
-        return actInfoFeignClient.getTeamTypeList();
+        return actInfoFeignClient.getTeamTypeList(formDto);
     }
 
     @Override

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

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.modules.volunteer.excel.VolunteerTeamTypeExcel;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerTeamTypeService;
 import com.elink.esua.epdc.volunteer.VolunteerTeamTypeDTO;
@@ -92,15 +93,28 @@ public class VolunteerTeamTypeController {
     }
 
     /**
-    * @describe: 查询所有志愿团队类别
+    * @describe: 小程序-查询所有志愿团队类别
     * @author wangtong
     * @date 2021/11/18 10:55
     * @params []
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @GetMapping("getTeamTypeList")
-    public Result getTeamTypeList(){
+    public Result getTeamTypeList(@RequestBody VolunteerTeamFormDTO formDto){
-        return volunteerTeamTypeService.getTeamTypeList();
+        return volunteerTeamTypeService.getTeamTypeList(formDto);
+    }
+
+
+    /**
+     * @describe: 查询所有志愿团队类别
+     * @author wangtong
+     * @date 2021/11/24 9:23
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("getSysTeamTypeList")
+    public Result getSysTeamTypeList(VolunteerTeamFormDTO formDto){
+        return volunteerTeamTypeService.getSysTeamTypeList(formDto);
     }
 
 }

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.volunteer.dao;
 
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamTypeEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -33,6 +34,15 @@ import java.util.List;
 @Mapper
 public interface VolunteerTeamTypeDao extends BaseDao<VolunteerTeamTypeEntity> {
 
+    /**
+     * @describe: 小程序-查询所有志愿团队类别
+     * @author wangtong
+     * @date 2021/11/18 10:55
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    List<VolunteerTeamTypeEntity> getTeamTypeList(VolunteerTeamFormDTO formDto);
+
     /**
      * @describe: 查询所有志愿团队类别
      * @author wangtong
@@ -40,5 +50,5 @@ public interface VolunteerTeamTypeDao extends BaseDao<VolunteerTeamTypeEntity> {
      * @params []
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
-    List<VolunteerTeamTypeEntity> getTeamTypeList();
+    List<VolunteerTeamTypeEntity> getSysTeamTypeList(VolunteerTeamFormDTO formDto);
 }

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

@@ -21,6 +21,7 @@ package com.elink.esua.epdc.modules.volunteer.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamTypeEntity;
 import com.elink.esua.epdc.volunteer.VolunteerTeamTypeDTO;
 
@@ -102,5 +103,14 @@ public interface VolunteerTeamTypeService extends BaseService<VolunteerTeamTypeE
      * @params []
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
-    Result getTeamTypeList();
+    Result getTeamTypeList(VolunteerTeamFormDTO formDto);
+
+    /**
+     * @describe: 查询所有志愿团队类别
+     * @author wangtong
+     * @date 2021/11/24 9:23
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getSysTeamTypeList(VolunteerTeamFormDTO formDto);
 }

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

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.VolunteerTeamFormDTO;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerTeamTypeDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamTypeEntity;
 import com.elink.esua.epdc.modules.volunteer.redis.VolunteerTeamTypeRedis;
@@ -153,8 +154,14 @@ public class VolunteerTeamTypeServiceImpl extends BaseServiceImpl<VolunteerTeamT
     }
 
     @Override
-    public Result getTeamTypeList() {
+    public Result getTeamTypeList(VolunteerTeamFormDTO formDto) {
-        List<VolunteerTeamTypeEntity> result = baseDao.getTeamTypeList();
+        List<VolunteerTeamTypeEntity> result = baseDao.getTeamTypeList(formDto);
+        return new Result().ok(result);
+    }
+
+    @Override
+    public Result getSysTeamTypeList(VolunteerTeamFormDTO formDto) {
+        List<VolunteerTeamTypeEntity> result = baseDao.getSysTeamTypeList(formDto);
         return new Result().ok(result);
     }
 

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

@@ -16,6 +16,17 @@
         <result property="updateDate" column="update_date"/>
     </resultMap>
     <select id="getTeamTypeList" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamTypeEntity">
+        SELECT distinct tt.*
+        FROM `epdc_volunteer_team_type` tt
+            left join epdc_volunteer_team t on t.TEAM_TYPE=tt.type_code
+        where tt.del_flag='0'
+                and tt.banner_flag = '0'
+                <if test="teamId != null and teamId != ''">
+                    and t.id= #{teamId}
+                </if>
+        order by tt.sort asc
+    </select>
+    <select id="getSysTeamTypeList" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerTeamTypeEntity">
         SELECT *
         FROM `epdc_volunteer_team_type`
         where del_flag='0'

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

@@ -232,4 +232,9 @@ public class VolunteerInfoDTO implements Serializable {
      * 志愿者部门名称
      */
     private String DeptName;
+
+    /**
+     * 志愿团队id
+     */
+    private String teamId;
 }

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

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.entity.VlounteerTeamRealationEntity;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -72,4 +73,13 @@ public interface VlounteerTeamRealationDao extends BaseDao<VlounteerTeamRealatio
     * @return com.elink.esua.epdc.entity.VlounteerTeamRealationEntity
     */
     VlounteerTeamRealationEntity selectByTeamIdAngVolunteerId(VolunteerTeamFormDTO dto);
+
+    /**
+    * @describe: 删除志愿者关联信息
+    * @author wangtong
+    * @date 2021/11/23 16:55
+    * @params [volunteerId]
+    * @return void
+    */
+    void deleteByVolunteerId(@Param("volunteerId") String volunteerId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java

@@ -78,11 +78,6 @@ public class VolunteerInfoEntity extends DeptScope {
      */
     private Integer participationNum;
 
-    /**
-     * 团队id
-     */
-    private String teamId;
-
 
     /**
      * 网格ID

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

@@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.UserFieldConsant;
 import com.elink.esua.epdc.constant.VolunteerInfoNoticeConstant;
+import com.elink.esua.epdc.dao.VlounteerTeamRealationDao;
 import com.elink.esua.epdc.dao.VolunteerInfoDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserTagDTO;
@@ -44,6 +45,7 @@ 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;
@@ -78,6 +80,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     @Autowired
     private VolunteerTagRelationService volunteerTagRelationService;
 
+    @Autowired
+    private VlounteerTeamRealationDao vlounteerTeamRealationDao;
+
     /**
      * 根据查询条件，返回首页 志愿者信息列表
      *
@@ -456,6 +461,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             this.sendNotice(volunteerEntity);
             userTagRelationService.addUserTagRelation(volunteerEntity.getUserId(), UserTagEnum.VOLUNTEER.value());
         }
+        //更新志愿者的志愿团队信息
+        updateVolunteerTeam(volunteerEntity,dto);
         // 更新志愿者标签
         VolunteerTagRelationDTO tagDto = new VolunteerTagRelationDTO();
         tagDto.setVolunteerId(volunteerEntity.getId());
@@ -465,6 +472,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result().ok(NumConstant.ONE);
     }
 
+    private void updateVolunteerTeam(VolunteerInfoEntity volunteerEntity, VolunteerInfoDTO 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) {
         baseDao.updateKindnessTime(formDto);

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

@@ -68,6 +68,10 @@
                     and TEAM_ID=#{teamId}
                     and VOLUNTEER_ID=#{volunteerId}
     </select>
+    <update id="deleteByVolunteerId">
+        update epdc_vlounteer_team_realation set DEL_FLAG='1',UPDATED_TIME = now()
+            where VOLUNTEER_ID=#{volunteerId}
+    </update>
 
 
 </mapper>

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

@@ -215,12 +215,14 @@
     <!--  根据用户id查询志愿者信息  -->
     <select id="selectOneVolunteerInfoDTO" parameterType="java.lang.String"
             resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
-        select m.*,
+         select m.*,
-               vt.tag_id
+               vt.tag_id,
-     from epdc_volunteer_info m
+			   tv.TEAM_ID
-        left join epdc_volunteer_tag_relation vt on vt.VOLUNTEER_ID = m.id and vt.del_flag = '0'
+         from epdc_volunteer_info m
-        where m.DEL_FLAG='0'
+            left join epdc_volunteer_tag_relation vt on vt.VOLUNTEER_ID = m.id and vt.del_flag = '0'
-        and m.USER_ID=#{userId}
+            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>
 
     <update id="updateVolunteerKindnessTime">