From 5941642fa6bd7cc2d10adec9a133aa4a56a3fc77 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 1 Apr 2020 16:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=BF=97=E6=84=BF=E8=80=85=E8=BA=AB=E4=BB=BD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E6=8E=92=E5=BA=8F=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VolunteerInfoServiceImpl.java        | 53 +++++++++++--------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
index ab95e6b5c..1003b243c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.async.NewsTask;
@@ -27,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 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.constant.UserFieldConsant;
 import com.elink.esua.epdc.constant.VolunteerInfoNoticeConstant;
 import com.elink.esua.epdc.dao.VolunteerInfoDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -87,27 +89,28 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         Integer page = Integer.parseInt(params.get("page").toString());
         Integer limit = Integer.parseInt(params.get("limit").toString());
         String allDeptIds = "";
-        if (params.get("streetId") != "" && params.get("streetId") != null){
+        if (params.get("streetId") != "" && params.get("streetId") != null) {
             allDeptIds = params.get("streetId").toString(); //查询条件 街道
         }
-        if (params.get("communityId") != "" && params.get("communityId") != null){
+        if (params.get("communityId") != "" && params.get("communityId") != null) {
             allDeptIds = params.get("communityId").toString(); //查询条件 社区
         }
-        if (params.get("gridId") != "" && params.get("gridId") != null){
+        if (params.get("gridId") != "" && params.get("gridId") != null) {
             allDeptIds = params.get("gridId").toString(); //查询条件 网格
         }
-        params.put("page",page - 1);
-        params.put("limit",limit);
-        params.put("allDeptIds",allDeptIds);
+        params.put("page", page - 1);
+        params.put("limit", limit);
+        params.put("allDeptIds", allDeptIds);
         int count = volunteerInfoDao.volunteerInfoCount(params);
         List<VolunteerInfoDTO> list = volunteerInfoDao.volunteerInfoList(params);
-        PageData<VolunteerInfoDTO> pageDate = new PageData<VolunteerInfoDTO>(list,count);
+        PageData<VolunteerInfoDTO> pageDate = new PageData<VolunteerInfoDTO>(list, count);
         return pageDate;
     }
 
     /**
      * 根据志愿者ID，查询志愿者 单条详情
-     *     积分需要连user表查询
+     * 积分需要连user表查询
+     *
      * @param id
      * @return
      */
@@ -132,8 +135,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return ConvertUtils.sourceToTarget(entityList, VolunteerInfoDTO.class);
     }
 
-    private QueryWrapper<VolunteerInfoEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<VolunteerInfoEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<VolunteerInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -170,6 +173,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     /**
      * 志愿者申请，根据用户表基础信息 赋默认值
+     *
      * @param id
      * @return VolunteerInfoDTO
      * @author zy
@@ -183,6 +187,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     /**
      * 向标签表中，查询唯一志愿者标签：tag_code = volunteer
+     *
      * @param tagCode
      * @return
      */
@@ -193,9 +198,10 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     /**
      * 根据用户id 进行志愿者认证
+     *
      * @param userId
-     * @author wanggongfeng
      * @return
+     * @author wanggongfeng
      * @Date 2019/12/13 16:39
      */
     @Override
@@ -205,9 +211,10 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     /**
      * 新增志愿者
+     *
      * @param epdcCompleteVolunteerInfoFormDTO
-     * @author wanggongfeng
      * @return
+     * @author wanggongfeng
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -223,7 +230,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         volunteerEntity.setAddress(address);      // 居住地址
 
         // 获取部门信息
-        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGridId()+"");
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGridId() + "");
         ParentAndAllDeptDTO parentAndAllDeptDTO = dtoResult.getData();
 
         volunteerEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());    // 父所有部门ID
@@ -245,7 +252,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      **/
     @Override
     public Result<EpdcAdjustVolunteerPointsDTO> getAdjustVolunteerPointsDTO(String id) {
-        if(StringUtils.isBlank(id) ){
+        if (StringUtils.isBlank(id)) {
             return new Result<EpdcAdjustVolunteerPointsDTO>().error("志愿者主键不能为空");
         }
         EpdcAdjustVolunteerPointsDTO adjustVolunteerPointsDTO = baseDao.selectAdjustVolunteerPointsDTO(id);
@@ -254,8 +261,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     /**
      * 获取排行榜
-     * @author wanggongfeng
+     *
      * @return
+     * @author wanggongfeng
      */
     @Override
     public Result<List<EpdcGetVolunteerRankDTO>> getRankingList() {
@@ -272,13 +280,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      **/
     @Override
     public Result<String> queryUserVolunteerFlag(String userId) {
-        QueryWrapper<VolunteerInfoEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(userId), "USER_ID", userId);
-        List<VolunteerInfoEntity> list = baseDao.selectList(wrapper);
-        if (null == list || list.size() == 0) {
-            return new Result<String>().ok("2");
+        if (StringUtils.isNotBlank(userId)) {
+            QueryWrapper<VolunteerInfoEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(UserFieldConsant.USER_ID, userId)
+                    .orderByDesc(FieldConstant.UPDATED_TIME);
+            List<VolunteerInfoEntity> list = baseDao.selectList(wrapper);
+            if (CollUtil.isNotEmpty(list)) {
+                return new Result().ok(list.get(NumConstant.ZERO).getAuditStatus());
+            }
         }
-        return new Result<String>().ok(list.get(0).getAuditStatus());
+        return new Result().ok(NumConstant.TWO_STR);
     }
 
     /**