From 7037ced5a61beb55ae82db2fe9000788d68ac48d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 18 Nov 2021 17:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E6=88=90=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/VlounteerTeamRealationDTO.java | 10 +++++++ .../VlounteerTeamRealationController.java | 21 ++++++++++++--- .../epdc/dao/VlounteerTeamRealationDao.java | 19 +++++++++++-- .../VlounteerTeamRealationService.java | 14 +++++++++- .../VlounteerTeamRealationServiceImpl.java | 23 ++++++++++++++-- .../mapper/VlounteerTeamRealationDao.xml | 27 ++++++++++++++++++- 6 files changed, 105 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VlounteerTeamRealationDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VlounteerTeamRealationDTO.java index e8b2392a..77625dcf 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VlounteerTeamRealationDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VlounteerTeamRealationDTO.java @@ -59,6 +59,16 @@ public class VlounteerTeamRealationDTO implements Serializable { */ private String teamType; + /** + * 成员姓名 + */ + private String realName; + + /** + * 手机号 + */ + private String mobile; + /** * 乐观锁 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java index d7f92fc1..60216194 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VlounteerTeamRealationController.java @@ -23,9 +23,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.VlounteerTeamRealationDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.excel.VlounteerTeamRealationExcel; import com.elink.esua.epdc.service.VlounteerTeamRealationService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +46,7 @@ import java.util.Map; @RestController @RequestMapping("vlounteerteamrealation") public class VlounteerTeamRealationController { - + @Autowired private VlounteerTeamRealationService vlounteerTeamRealationService; @@ -91,4 +92,18 @@ public class VlounteerTeamRealationController { ExcelUtils.exportExcelToTarget(response, null, list, VlounteerTeamRealationExcel.class); } -} \ No newline at end of file + + /** + * @describe: 通过志愿团队id获取志愿者信息 + * @author wangtong + * @date 2021/11/18 16:26 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getVolunteerListByTeamId") + public Result> getVolunteerListByTeamId(@RequestParam Map params) { + PageData page = vlounteerTeamRealationService.getVolunteerListByTeamId(params); + return new Result>().ok(page); + } + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VlounteerTeamRealationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VlounteerTeamRealationDao.java index 9b5a016d..dd35052c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VlounteerTeamRealationDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VlounteerTeamRealationDao.java @@ -18,9 +18,14 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.VlounteerTeamRealationDTO; import com.elink.esua.epdc.entity.VlounteerTeamRealationEntity; +import com.elink.esua.epdc.entity.VolunteerInfoEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 志愿者-志愿团队关联表 * @@ -29,5 +34,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface VlounteerTeamRealationDao extends BaseDao { - -} \ No newline at end of file + + List getPageList(Map params); + + /** + * @describe: 通过志愿团队id获取志愿者信息 + * @author wangtong + * @date 2021/11/18 16:26 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + List getVolunteerListByTeamId(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VlounteerTeamRealationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VlounteerTeamRealationService.java index 71f802f9..6ec5891d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VlounteerTeamRealationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VlounteerTeamRealationService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.VlounteerTeamRealationDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.entity.VlounteerTeamRealationEntity; import java.util.List; @@ -92,4 +93,15 @@ public interface VlounteerTeamRealationService extends BaseService getPageList(Map params); + + /** + * @describe: 通过志愿团队id获取志愿者信息 + * @author wangtong + * @date 2021/11/18 16:26 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + PageData getVolunteerListByTeamId(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java index 7e0d86c5..909868ae 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VlounteerTeamRealationServiceImpl.java @@ -20,12 +20,14 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dao.VlounteerTeamRealationDao; import com.elink.esua.epdc.dto.VlounteerTeamRealationDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.entity.VlounteerTeamRealationEntity; +import com.elink.esua.epdc.entity.VolunteerInfoEntity; import com.elink.esua.epdc.redis.VlounteerTeamRealationRedis; import com.elink.esua.epdc.service.VlounteerTeamRealationService; import org.apache.commons.lang3.StringUtils; @@ -58,6 +60,21 @@ public class VlounteerTeamRealationServiceImpl extends BaseServiceImpl getPageList(Map params) { + IPage page = getPage(params); + List list = baseDao.getPageList(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + public PageData getVolunteerListByTeamId(Map params) { + IPage page = getPage(params); + //查询 + List list = baseDao.getVolunteerListByTeamId(params); + return getPageData(list, page.getTotal(), VolunteerInfoDTO.class); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); @@ -101,4 +118,6 @@ public class VlounteerTeamRealationServiceImpl extends BaseServiceImpl + + - \ No newline at end of file + +