团队成员列表

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;
+
     /**
      * 乐观锁
      */

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);
     }
 
-}
+
+    /**
+    * @describe: 通过志愿团队id获取志愿者信息
+    * @author wangtong
+    * @date 2021/11/18 16:26
+    * @params [params]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+    */
+    @GetMapping("getVolunteerListByTeamId")
+    public Result<PageData<VolunteerInfoDTO>> getVolunteerListByTeamId(@RequestParam Map<String, Object> params) {
+        PageData<VolunteerInfoDTO> page = vlounteerTeamRealationService.getVolunteerListByTeamId(params);
+        return new Result<PageData<VolunteerInfoDTO>>().ok(page);
+    }
+
+}

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<VlounteerTeamRealationEntity> {
-	
-}
+
+    List<VlounteerTeamRealationDTO> getPageList(Map<String, Object> params);
+
+    /**
+     * @describe: 通过志愿团队id获取志愿者信息
+     * @author wangtong
+     * @date 2021/11/18 16:26
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+     */
+    List<VolunteerInfoEntity> getVolunteerListByTeamId(Map<String, Object> params);
+}

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<VlounteerTeam
      * @date 2021-11-16
      */
     void delete(String[] ids);
-}
+
+    PageData<VlounteerTeamRealationDTO> getPageList(Map<String, Object> params);
+
+    /**
+     * @describe: 通过志愿团队id获取志愿者信息
+     * @author wangtong
+     * @date 2021/11/18 16:26
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.VolunteerInfoDTO>>
+     */
+    PageData<VolunteerInfoDTO> getVolunteerListByTeamId(Map<String, Object> params);
+}

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<Vlounteer
         return getPageData(page, VlounteerTeamRealationDTO.class);
     }
 
+    @Override
+    public PageData<VlounteerTeamRealationDTO> getPageList(Map<String, Object> params) {
+        IPage<VlounteerTeamRealationDTO> page = getPage(params);
+        List<VlounteerTeamRealationDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public PageData<VolunteerInfoDTO> getVolunteerListByTeamId(Map<String, Object> params) {
+        IPage<VolunteerInfoEntity> page = getPage(params);
+        //查询
+        List<VolunteerInfoEntity> list = baseDao.getVolunteerListByTeamId(params);
+        return getPageData(list, page.getTotal(), VolunteerInfoDTO.class);
+    }
+
     @Override
     public List<VlounteerTeamRealationDTO> list(Map<String, Object> params) {
         List<VlounteerTeamRealationEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -101,4 +118,6 @@ public class VlounteerTeamRealationServiceImpl extends BaseServiceImpl<Vlounteer
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VlounteerTeamRealationDao.xml

@@ -16,6 +16,31 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
+    <select id="getPageList" resultType="com.elink.esua.epdc.dto.VlounteerTeamRealationDTO">
 
+    </select>
+    <select id="getVolunteerListByTeamId" resultType="com.elink.esua.epdc.entity.VolunteerInfoEntity">
+        SELECT  r.id,
+				v.REAL_NAME,
+				v.MOBILE,
+				case v.SEX
+				when '0' then '女'
+				when '1' then '男'
+				else ''
+				end as sex
+        FROM `epdc_vlounteer_team_realation` r
+        inner join epdc_volunteer_info v on r.VOLUNTEER_ID=v.ID
+        where r.DEL_FLAG='0'
+              and v.DEL_FLAG='0'
+              and r.TEAM_ID=#{teamId}
+        <if test="mobile != null and mobile != ''">
+            and v.MOBILE like '%${mobile}%'
+        </if>
+        <if test="realName != null and realName != ''">
+            and v.REAL_NAME like '%${realName}%'
+        </if>
+        order by v.CREATED_TIME desc
+    </select>
 
-</mapper>
+
+</mapper>