From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 12e7b78..d74b6d6 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
@@ -8,6 +8,7 @@
 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.service_community.dao.ComMngVolunteerMngDAO;
 import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
@@ -17,6 +18,8 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -37,9 +40,9 @@
     @Override
     public R addVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
         String phone = comMngVolunteerMngVO.getPhone();
-        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, phone));
+        Integer integer = comMngVolunteerMngDAO.selectCount(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, phone).in(ComMngVolunteerMngDO::getState, Arrays.asList(new Integer[]{1,2})));
         if (null!=integer&&integer.intValue()>0) {
-            return R.fail("手机号已经存在");
+            return R.fail("请勿重复申请");
         }
         ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
         BeanUtils.copyProperties(comMngVolunteerMngVO,comMngVolunteerMngDO);
@@ -142,6 +145,8 @@
         }
         ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
         BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO);
+        String phone = comMngVolunteerMngVO.getPhone();
+        comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
         return R.ok(comMngVolunteerMngVO);
     }
 
@@ -211,5 +216,20 @@
         return R.ok(comMngVolunteerMngAppletsVO);
     }
 
+    /**
+     * 社区后台数据看板
+     *
+     * @param communityId 社区id
+     * @param userId      用户id
+     * @return 人脸采集和志愿者审核集合
+     */
+    @Override
+    public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
+        List<TodoEventsVO> todoEventsVOS=comMngVolunteerMngDAO.selectNeedToDo(communityId);
+        return todoEventsVOS;
+    }
+
+
+
 
 }

--
Gitblit v1.7.1