志愿者接口开发，志愿者表增加：志愿者签名昵称/志愿者头像/志愿者签名 字段

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
@@ -328,4 +329,17 @@ public class ApiAppUserController {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.getUserWxPhone(formDto);
     }
+
+    /*
+     * 志愿者列表
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:33 2020-05-18
+     **/
+    @GetMapping("volunteer/list")
+    public Result<List<EpdcAppVolunteerListResultDTO>> volunteerList(EpdcAppVolunteerListFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return appUserService.listVolunteer(dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -367,4 +367,14 @@ public interface UserFeignClient {
      */
     @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
+
+    /*
+     * 志愿者列表
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:33 2020-05-18
+     **/
+    @GetMapping("app-user/epdc-app/volunteerinfo/list")
+    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -180,4 +180,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", formDTO);
     }
+
+    @Override
+    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteer", dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
@@ -258,4 +259,13 @@ public interface AppUserService {
      * @date 2020/2/20 17:24
      */
     Result<String> getUserWxPhone(EpdcAppUserMaInfoFormDTO formDto);
+
+    /*
+     * 志愿者列表
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:33 2020-05-18
+     **/
+    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -24,10 +24,7 @@ import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
@@ -1415,4 +1412,9 @@ public class AppUserServiceImpl implements AppUserService {
         }
         return new Result().ok(authorizationDto);
     }
+
+    @Override
+    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+        return userFeignClient.listVolunteer(dto);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java

@@ -196,4 +196,19 @@ public class VolunteerInfoDTO implements Serializable {
      * 志愿者注册时间
      */
     private String registTimeString;
-}
+
+    /**
+     * 志愿者签名昵称
+     */
+    private String volunteerNickname;
+
+    /**
+     * 志愿者头像
+     */
+    private String volunteerFaceImg;
+
+    /**
+     * 志愿者签名
+     */
+    private String volunteerSignature;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+
+/**
+ * 志愿者列表
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-05-18
+ */
+@Data
+public class EpdcAppVolunteerListFormDTO {
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 移动端接口-志愿者列表接口返回值
+ * @Author zhangyong
+ * @Date 2020-05-18
+ */
+@Data
+public class EpdcAppVolunteerListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3908231797102233188L;
+
+    /**
+     * 志愿者ID
+     */
+    private String id;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String faceImg;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java

@@ -5,7 +5,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 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.epdc.form.EpdcAppVolunteerListFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.service.VolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +62,16 @@ public class EpdcAppVolunteerInfoController {
         return volunteerInfoService.getRankingList();
     }
 
-
+    /**
+     * 志愿者列表
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:08 2020-05-18
+     **/
+    @GetMapping("list")
+    public Result<List<EpdcAppVolunteerListResultDTO>> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) {
+        return volunteerInfoService.listVolunteer(dto);
+    }
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java

@@ -20,8 +20,10 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -128,4 +130,13 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @since 2020/2/7 18:34
      */
     void updateVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto);
+
+    /**
+     * 志愿者列表
+     * @param dto
+     * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcAppVolunteerListResultDTO>
+     * @Author zhangyong
+     * @Date 15:08 2020-05-18
+     **/
+    List<EpdcAppVolunteerListResultDTO> selectListVolunteer(EpdcAppVolunteerListFormDTO dto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java

@@ -134,4 +134,18 @@ public class VolunteerInfoEntity extends DeptScope {
      */
     private Long auditor;
 
-}
+    /**
+     * 志愿者签名昵称
+     */
+    private String volunteerNickname;
+
+    /**
+     * 志愿者头像
+     */
+    private String volunteerFaceImg;
+
+    /**
+     * 志愿者签名
+     */
+    private String volunteerSignature;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java

@@ -22,9 +22,11 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 
@@ -204,4 +206,13 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @since 2020/2/7 18:37
      */
     Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto);
+
+    /*
+     * 志愿者列表
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
+     * @Author zhangyong
+     * @Date 15:33 2020-05-18
+     **/
+    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -36,10 +36,12 @@ import com.elink.esua.epdc.dao.VolunteerInfoDao;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -386,4 +388,11 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result();
     }
 
+    @Override
+    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+        int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
+        dto.setPageIndex(pageIndex);
+        List<EpdcAppVolunteerListResultDTO> data = baseDao.selectListVolunteer(dto);
+        return new Result().ok(data);
+    }
 }

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

@@ -34,6 +34,9 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="volunteerNickname" column="VOLUNTEER_NICKNAME"/>
+        <result property="volunteerFaceImg" column="VOLUNTEER_FACE_IMG"/>
+        <result property="volunteerSignature" column="VOLUNTEER_SIGNATURE"/>
     </resultMap>
 
     <!--根据查询条件，返回首页 志愿者信息列表-->
@@ -206,4 +209,18 @@
             USER_ID = #{userId}
             AND DEL_FLAG = '0'
     </update>
+
+    <select id="selectListVolunteer" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO">
+        SELECT
+            v.ID id,
+            v.VOLUNTEER_NICKNAME nickname,
+			v.VOLUNTEER_FACE_IMG faceImg
+        FROM
+            epdc_volunteer_info v
+        WHERE
+          v.DEL_FLAG = 0
+          AND v.AUDIT_STATUS != 2
+        ORDER BY v.VOLUNTEER_NICKNAME
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 </mapper>