From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
index 7b333ab..6f59bcf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
+++ b/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){
--
Gitblit v1.7.1