From dfa3cdd78a782564f542560129b140d52e707f57 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 17 Dec 2019 13:57:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B3=A8=E9=87=8A=E7=BB=B4=E6=8A=A4=20-=20?=
 =?UTF-8?q?=E5=BC=A0=E5=8B=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/VolunteerInfoController.java   | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
index e3e98eb2e..812026284 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
@@ -61,11 +61,13 @@ public class VolunteerInfoController {
 
     @Autowired
     private UserTagRelationService userTagRelationService; //用户标签关系表
+
     /**
-     * 查询列表数据
-     * @Description 查询列表数据
-     * @param params
-     * @return
+     * @Description:  查询列表数据
+     * @Param: [params]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+     * @Author: zy
+     * @Date: 2019-12-17
      */
     @GetMapping("page")
     public Result<PageData<VolunteerInfoDTO>> page(@RequestParam Map<String, Object> params){
@@ -74,11 +76,12 @@ public class VolunteerInfoController {
     }
 
     /**
-     * 根据志愿者ID，查询志愿者 单条详情
-     *  积分需要连user表查询
-     * @Description 查询志愿者 单条详情
-     * @param id
-     * @return
+     * @Description:  根据志愿者ID，查询志愿者 信息详情
+     *                积分需要连user表查询
+     * @Param: [id]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.VolunteerInfoDTO>
+     * @Author: zy
+     * @Date: 2019-12-17
      */
     @GetMapping("getVolunteerDetail/{id}")
     public Result<VolunteerInfoDTO> getVolunteerDetail(@PathVariable("id") String id){
@@ -101,16 +104,12 @@ public class VolunteerInfoController {
     }
 
     /**
-     * 志愿者 申请审批
-     * 通过   更新user表 和 志愿者表
-     * 不通过  更新user表
-     *
-     * 向用户标签表epdc_user_tag 和 用户标签关系表epdc_user_tag_relation 添加用户身份
-     *
-     * 消息进行推送
-     * @Description 志愿者 申请审批
-     * @param dto   志愿者表id，是否通过，审核不通过的原因
-     * @return
+     * @Description:  志愿者 申请审批
+     *                审批不通过、拉入黑名单，清除用户标签关系表,志愿者标签,并进行消息推送
+     * @Param: [dto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: zy
+     * @Date: 2019-12-17
      */
     @PostMapping("volunteerInfoCheck")
     public Result volunteerInfoCheck(@RequestBody VolunteerInfoDTO dto){
@@ -128,7 +127,7 @@ public class VolunteerInfoController {
 
             //向标签表中，查询唯一志愿者标签：tag_code = volunteer
             UserTagDTO userTag = volunteerInfoService.volunteerTagQuery("volunteer");
-            UserTagRelationDTO userTagRelationDTO = new UserTagRelationDTO();//添加：用户标签关系表epdc_user_tag_relation
+            UserTagRelationDTO userTagRelationDTO = new UserTagRelationDTO();
             userTagRelationDTO.setUserId(data.getUserId());
             userTagRelationDTO.setTagId(userTag.getId());
             userTagRelationService.save(userTagRelationDTO);