From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 5 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 00bf6d7..191ca15 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
@@ -5,9 +5,12 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActVO;
+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;
@@ -16,6 +19,8 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -36,11 +41,12 @@
     @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);
         int insert = comMngVolunteerMngDAO.insert(comMngVolunteerMngDO);
         if (insert>0) {
             return R.ok();
@@ -56,7 +62,8 @@
      */
     @Override
     public R deleteVolunteer(ComMngVolunteerMngVO comMngVolunteerMngVO) {
-        int delete = comMngVolunteerMngDAO.delete(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getPhone, comMngVolunteerMngVO.getPhone()));
+        ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(comMngVolunteerMngVO.getId());
+        int delete = comMngVolunteerMngDAO.delete(new QueryWrapper<ComMngVolunteerMngDO>().lambda().eq(ComMngVolunteerMngDO::getId, comMngVolunteerMngDO.getId()));
         if (delete>0) {
             return R.ok();
         }
@@ -100,6 +107,9 @@
         page.setSize(pageSize);
         page.setCurrent(pageNum);
         IPage<ComMngVolunteerMngVO> iPage = comMngVolunteerMngDAO.pageVolunteer(page, comMngVolunteerMngVO);
+        iPage.getRecords().forEach(record->{
+            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
+        });
         return R.ok(iPage);
     }
 
@@ -140,6 +150,8 @@
         }
         ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
         BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO);
+        //String phone = comMngVolunteerMngVO.getPhone();
+        //comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
         return R.ok(comMngVolunteerMngVO);
     }
 
@@ -192,7 +204,42 @@
         return R.fail();
     }
 
+    /**
+     * 志愿者详情
+     *
+     * @param id 主键
+     * @return 志愿者
+     */
+    @Override
+    public R detailVolunteer(Long id) {
+        ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id);
+        if (ObjectUtils.isEmpty(comMngVolunteerMngDO)) {
+            return R.fail("志愿者不存在");
+        }
+        ComMngVolunteerMngAppletsVO comMngVolunteerMngAppletsVO=new ComMngVolunteerMngAppletsVO();
+        BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngAppletsVO);
+        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;
+    }
 
 
-
+    @Override
+    public R getVolunteerById(Long id) {
+        ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id);
+        ComMngVolunteerMngAppletsVO vo=new ComMngVolunteerMngAppletsVO();
+        BeanUtils.copyProperties(comMngVolunteerMngDO,vo);
+        return R.ok(vo);
+    }
 }

--
Gitblit v1.7.1