From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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..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
@@ -8,7 +8,9 @@
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;
@@ -17,6 +19,8 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -37,9 +41,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);
@@ -58,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();
}
@@ -102,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);
}
@@ -142,6 +150,8 @@
}
ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO);
+ //String phone = comMngVolunteerMngVO.getPhone();
+ //comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
return R.ok(comMngVolunteerMngVO);
}
@@ -211,5 +221,25 @@
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