[修改]修改配置

manailin

2022-04-08 8d5fb4ee9d27fd6a61b210eaee74af265f76aa7c

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

@@ -10,6 +10,7 @@
import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerErrorExcelVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComMngVolunteerOrgTeamMapper;
import com.panzhihua.service_community.dao.ComMngVolunteerSkillMapper;
@@ -48,6 +49,8 @@
    private ComMngVolunteerOrgTeamMapper comMngVolunteerOrgTeamMapper;
    @Resource
    private ComMngVolunteerSkillMapper comMngVolunteerSkillMapper;
    @Resource
    private UserService userService;

    /**
     * 增加志愿者
@@ -59,8 +62,10 @@
    @Override
    public R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
        String phone = comMngVolunteerMngVO.getPhone();
        String idCard = comMngVolunteerMngVO.getIdCard();
        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda()
            .eq(ComMngVolunteerMngDO::getPhone, phone).in(ComMngVolunteerMngDO::getState, Arrays.asList(1, 2)));
                .and(wrapper -> wrapper.eq(ComMngVolunteerMngDO::getPhone, phone).or().eq(ComMngVolunteerMngDO::getIdCard, idCard))
                .in(ComMngVolunteerMngDO::getState, Arrays.asList(1, 2)));
        if (null != integer && integer.intValue() > 0) {
            return R.fail("请勿重复申请");
        }
@@ -171,12 +176,7 @@
     */
    @Override
    public R detailVolunteerExamine(Long id) {
        ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id);
        if (ObjectUtils.isEmpty(comMngVolunteerMngDO)) {
            return R.fail("审核不存在");
        }
        ComMngVolunteerMngVO comMngVolunteerMngVO = new ComMngVolunteerMngVO();
        BeanUtils.copyProperties(comMngVolunteerMngDO, comMngVolunteerMngVO);
        ComMngVolunteerMngVO comMngVolunteerMngVO = comMngVolunteerMngDAO.detailVolunteerExamine(id);
        // String phone = comMngVolunteerMngVO.getPhone();
        // comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
        return R.ok(comMngVolunteerMngVO);
@@ -354,6 +354,7 @@
                    comMngVolunteerMngDO.setSubmitUserId(volunteerUserId);
                }
                comMngVolunteerMngDAO.insert(comMngVolunteerMngDO);
                userService.putUserIsVolunteer(comMngVolunteerMngDO.getPhone(), 1);
            }
        }
        if(errorList.size() > 0){