Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java

@@ -1,5 +1,14 @@
package com.panzhihua.service_community.service.impl;

import java.util.Arrays;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,20 +16,12 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import com.panzhihua.service_community.service.ComMngVolunteerMngService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,16 +33,19 @@
public class ComMngVolunteerMngServiceImpl implements ComMngVolunteerMngService {
    @Resource
    private ComMngVolunteerMngDAO comMngVolunteerMngDAO;

    /**
     * 增加志愿者
     *
     * @param comMngVolunteerMngVO 志愿者信息
     * @param comMngVolunteerMngVO
     *            志愿者信息
     * @return 增加结果
     */
    @Override
    public R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        String phone = comMngVolunteerMngVO.getPhone();
        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, phone).in(ComMngVolunteerMngDO::getState, Arrays.asList(new Integer[]{1,2})));
        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda()
            .eq(ComMngVolunteerMngDO::getPhone, phone).in(ComMngVolunteerMngDO::getState, Arrays.asList(1, 2)));
        if (null!=integer&&integer.intValue()>0) {
            return R.fail("请勿重复申请");
        }
@@ -57,13 +61,15 @@
    /**
     * 删除志愿者
     *
     * @param comMngVolunteerMngVO 手机号
     * @param comMngVolunteerMngVO
     *            手机号
     * @return 删除结果
     */
    @Override
    public R deleteVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(comMngVolunteerMngVO.getId());
        int delete = comMngVolunteerMngDAO.delete(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getId, comMngVolunteerMngDO.getId()));
        int delete = comMngVolunteerMngDAO.delete(new QueryWrapper<ComMngVolunteerMngDO>().lambda()
            .eq(ComMngVolunteerMngDO::getId, comMngVolunteerMngDO.getId()));
        if (delete>0) {
            return R.ok();
        }
@@ -73,7 +79,8 @@
    /**
     * 编辑志愿者
     *
     * @param comMngVolunteerMngVO 编辑内容
     * @param comMngVolunteerMngVO
     *            编辑内容
     * @return 编辑结果
     */
    @Override
@@ -90,7 +97,8 @@
    /**
     * 分页展示志愿者
     *
     * @param comMngVolunteerMngVO 查询参数
     * @param comMngVolunteerMngVO
     *            查询参数
     * @return 分页集合返回
     */
    @Override
@@ -116,7 +124,8 @@
    /**
     * 分页展示志愿者审核
     *
     * @param comMngVolunteerMngVO 查询参数
     * @param comMngVolunteerMngVO
     *            查询参数
     * @return 查询结果
     */
    @Override
@@ -139,7 +148,8 @@
    /**
     * 志愿者审核详情
     *
     * @param id 主键
     * @param id
     *            主键
     * @return 详情
     */
    @Override
@@ -158,7 +168,8 @@
    /**
     * 志愿者审核
     *
     * @param comMngVolunteerMngVO 审核操作
     * @param comMngVolunteerMngVO
     *            审核操作
     * @return 审核结果
     */
    @Override
@@ -175,7 +186,8 @@
    /**
     * 删除志愿者审核
     *
     * @param comMngVolunteerMngVO 主键
     * @param comMngVolunteerMngVO
     *            主键
     * @return 删除结果
     */
    @Override
@@ -190,14 +202,16 @@
    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     *
     * @param userPhoneVO 新旧手机号
     * @param userPhoneVO
     *            新旧手机号
     * @return 修改结果
     */
    @Override
    public R putVolunteerPhone(UserPhoneVO userPhoneVO) {
        ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
        comMngVolunteerMngDO.setPhone(userPhoneVO.getNewPhone());
        int update = comMngVolunteerMngDAO.update(comMngVolunteerMngDO, new UpdateWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, userPhoneVO.getOldPhone()));
        int update = comMngVolunteerMngDAO.update(comMngVolunteerMngDO, new UpdateWrapper<ComMngVolunteerMngDO>()
            .lambda().eq(ComMngVolunteerMngDO::getPhone, userPhoneVO.getOldPhone()));
        if (update>0) {
            return R.ok();
        }
@@ -207,7 +221,8 @@
    /**
     * 志愿者详情
     *
     * @param id 主键
     * @param id
     *            主键
     * @return 志愿者
     */
    @Override
@@ -224,8 +239,10 @@
    /**
     * 社区后台数据看板
     *
     * @param communityId 社区id
     * @param userId      用户id
     * @param communityId
     *            社区id
     * @param userId
     *            用户id
     * @return 人脸采集和志愿者审核集合
     */
    @Override
@@ -233,7 +250,6 @@
        List<TodoEventsVO> todoEventsVOS=comMngVolunteerMngDAO.selectNeedToDo(communityId);
        return todoEventsVOS;
    }


    @Override
    public R getVolunteerById(Long id) {