修改志愿者分页查询

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

@@ -56,34 +56,34 @@ public class VolunteerInfoController {
     private UserTagService userTagService; //标签表
 
     /**
-     * @Description:  查询列表数据
+     * @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>>
+     * @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){
+    public Result<PageData<VolunteerInfoDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<VolunteerInfoDTO> page = volunteerInfoService.volunteerInfo(params);
         return new Result<PageData<VolunteerInfoDTO>>().ok(page);
     }
 
     /**
-     * @Description:  根据志愿者ID，查询志愿者 信息详情
-     *                积分需要连user表查询
+     * @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){
+    public Result<VolunteerInfoDTO> getVolunteerDetail(@PathVariable("id") String id) {
         VolunteerInfoDTO data = volunteerInfoService.getVolunteerDetail(id);
         return new Result<VolunteerInfoDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody VolunteerInfoDTO dto){
+    public Result save(@RequestBody VolunteerInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         volunteerInfoService.save(dto);
@@ -91,26 +91,26 @@ public class VolunteerInfoController {
     }
 
     @GetMapping("{id}")
-    public Result<VolunteerInfoDTO> get(@PathVariable("id") String id){
+    public Result<VolunteerInfoDTO> get(@PathVariable("id") String id) {
         VolunteerInfoDTO data = volunteerInfoService.get(id);
         return new Result<VolunteerInfoDTO>().ok(data);
     }
 
     /**
-     * @Description:  志愿者 申请审批
-     *                审批不通过、拉入黑名单，清除用户标签关系表,志愿者标签,并进行消息推送
+     * @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){
+    public Result volunteerInfoCheck(@RequestBody VolunteerInfoDTO dto) {
         return volunteerInfoService.volunteerInfoCheck(dto);
     }
 
     @PutMapping
-    public Result update(@RequestBody VolunteerInfoDTO dto){
+    public Result update(@RequestBody VolunteerInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         volunteerInfoService.update(dto);
@@ -118,7 +118,7 @@ public class VolunteerInfoController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         volunteerInfoService.delete(ids);
@@ -168,11 +168,10 @@ public class VolunteerInfoController {
     }
 
     /**
-     *
      * 增加志愿者爱心时长
      *
-     * @params [formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [formDto]
      * @author liuchuang
      * @since 2020/2/7 18:40
      */

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.async.NewsTask;
@@ -42,7 +43,6 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.redis.VolunteerInfoRedis;
 import com.elink.esua.epdc.service.UserTagRelationService;
 import com.elink.esua.epdc.service.VolunteerInfoService;
 import org.apache.commons.lang3.StringUtils;
@@ -64,12 +64,6 @@ import java.util.Map;
 @Service
 public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao, VolunteerInfoEntity> implements VolunteerInfoService {
 
-    @Autowired
-    private VolunteerInfoRedis volunteerInfoRedis;
-
-    @Autowired
-    private VolunteerInfoDao volunteerInfoDao;
-
     @Autowired
     private NewsTask newsTask;
 
@@ -87,25 +81,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      */
     @Override
     public PageData<VolunteerInfoDTO> volunteerInfo(Map<String, Object> params) {
-        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) {
-            allDeptIds = params.get("streetId").toString(); //查询条件 街道
-        }
-        if (params.get("communityId") != "" && params.get("communityId") != null) {
-            allDeptIds = params.get("communityId").toString(); //查询条件 社区
-        }
-        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);
-        int count = volunteerInfoDao.volunteerInfoCount(params);
-        List<VolunteerInfoDTO> list = volunteerInfoDao.volunteerInfoList(params);
-        PageData<VolunteerInfoDTO> pageDate = new PageData<VolunteerInfoDTO>(list, count);
-        return pageDate;
+        String streetId = MapUtil.getStr(params, "streetId");
+        String communityId = MapUtil.getStr(params, "communityId");
+
+        String deptId = StringUtils.isNotBlank(streetId) ? streetId :
+                StringUtils.isNotBlank(communityId) ? communityId : MapUtil.getStr(params, "gridId");
+        params.put("deptId", deptId);
+
+        IPage<VolunteerInfoDTO> page = getPage(params);
+        List<VolunteerInfoDTO> list = baseDao.volunteerInfoList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     /**
@@ -117,7 +102,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      */
     @Override
     public VolunteerInfoDTO getVolunteerDetail(String id) {
-        return volunteerInfoDao.getVolunteerDetail(id);
+        return baseDao.getVolunteerDetail(id);
     }
 
     @Override
@@ -182,7 +167,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      */
     @Override
     public Result<VolunteerInfoDTO> getVolunteerUserDefaultValue(String id) {
-        VolunteerInfoDTO vo = volunteerInfoDao.getVolunteerUserDefaultValue(id);
+        VolunteerInfoDTO vo = baseDao.getVolunteerUserDefaultValue(id);
         return new Result<VolunteerInfoDTO>().ok(vo);
     }
 
@@ -194,7 +179,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
      */
     @Override
     public UserTagDTO volunteerTagQuery(String tagCode) {
-        return volunteerInfoDao.volunteerTagQuery(tagCode);
+        return baseDao.volunteerTagQuery(tagCode);
     }
 
     /**
@@ -351,6 +336,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             newsTask.insertUserInformation(informationFormDTO);
         } else {
             //2、审核通过-新增用户标签关系表（此方法里面实现了更新redis里的userTagInfos）
+            if (isVolunteer(volunteerInfoDTO.getUserId())) {
+                return new Result().error("当前用户已审核通过，无法操作历史记录");
+            }
             userTagRelationService.addUserTagRelation(volunteerInfoDTO.getUserId(), UserTagEnum.VOLUNTEER.value());
         }
         //3、更新志愿者信息表
@@ -358,6 +346,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result();
     }
 
+    private boolean isVolunteer(String userId) {
+        QueryWrapper<VolunteerInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(UserFieldConsant.USER_ID, userId)
+                .eq("AUDIT_STATUS", NumConstant.ONE_STR);
+        if (baseDao.selectCount(wrapper) > NumConstant.ZERO) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto) {

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

@@ -61,8 +61,8 @@
         <if test="mobile !='' and mobile != null">
             and v.MOBILE = #{mobile}
         </if>
-        <if test="allDeptIds !='' and allDeptIds != null">
-            and v.ALL_DEPT_IDS like concat('%',#{allDeptIds},'%')
+        <if test="deptId !='' and deptId != null">
+            and v.ALL_DEPT_IDS like concat('%',#{deptId},'%')
         </if>
         ORDER BY v.CREATED_TIME DESC
         LIMIT #{page},#{limit}