From ada9d2e3f734582a0d9ae8c00a936d8c8ed669d7 Mon Sep 17 00:00:00 2001 From: huanghongfa <18228131219@163.com> Date: 星期五, 15 一月 2021 13:51:44 +0800 Subject: [PATCH] 微心愿详情bug --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 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 e680187..ec4c541 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,8 +5,10 @@ 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.service_community.dao.ComMngVolunteerMngDAO; import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO; @@ -16,6 +18,7 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; +import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -141,6 +144,8 @@ } ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO(); BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO); + String phone = comMngVolunteerMngVO.getPhone(); + comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone)); return R.ok(comMngVolunteerMngVO); } @@ -193,7 +198,35 @@ 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; + } } -- Gitblit v1.7.1