Merge remote-tracking branch 'origin/feature/phaseOne'

# Conflicts: # epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java # epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java # epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java # epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
4 years ago · 3fca98e625
6 changed files with 104 additions and 3 deletions
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
@ -372,4 +372,29 @@ public class UserController {
        PageData<UserPointResultDTO> page = userService.listPoint(params);
        return new Result<PageData<UserPointResultDTO>>().ok(page);
    }
+
+    /**
+    * @describe: 通过手机号获取用户信息
+    * @author wangtong
+    * @date 2021/9/23 16:39
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getUserByMobile")
+    public Result getUserByMobile( String mobile) {
+        return userService.getUserByMobile(mobile);
+    }
+
+    /**
+    * @describe: 志愿组织模块获取用户列表
+    * @author wangtong
+    * @date 2021/9/29 10:33
+    * @params [mobile]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getUserListForVolunteerOrg")
+    public Result<PageData<UserDTO>> getUserListForVolunteerOrg(@RequestParam Map<String, Object> params) {
+        PageData<UserDTO> page = userService.getUserListForVolunteerOrg(params);
+        return new Result<PageData<UserDTO>>().ok(page);
+    }
 }
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
@ -23,6 +23,9 @@ import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserPointResultDTO;
 import com.elink.esua.epdc.dto.UserPointsDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.entity.UserEntity;
 import org.apache.ibatis.annotations.Mapper;
@ -286,6 +289,14 @@ public interface UserDao extends BaseDao<UserEntity> {
     * @Date 14:56 2020-06-01
     **/
    EpdcAppRankingUserDTO selectCurrentUserRanking(EpdcAppUserRankingFormDTO formDto);
+    /**
+     * @describe: 通过手机号获取用户信息
+     * @author wangtong
+     * @date 2021/9/23 16:39
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    UserDTO getUserByMobile(@Param("mobile") String mobile);

    /**
     * 获取当前用户的 用户等级排名
@ -306,4 +317,12 @@ public interface UserDao extends BaseDao<UserEntity> {
     * @date 2020/8/3 13:43
     */
    List<UserPointResultDTO> selectListPoints(Map<String, Object> params);
+    /**
+    * @describe: 志愿组织模块获取用户列表
+    * @author wangtong
+    * @date 2021/9/29 10:35
+    * @params [dto]
+    * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+    */
+    List<UserEntity> getUserListForVolunteerOrg(Map<String, Object> params);
 }
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java
@ -93,10 +93,11 @@ public interface UserService extends BaseService<UserEntity> {
    Result modifyPartyInfo(PartyMemberModifyFormDTO dto);

    /**
+     *
     * 新增党员信息并认证通过
     *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
     * @author liuchuang
     * @since 2020/3/25 14:33
     */
@ -369,10 +370,11 @@ public interface UserService extends BaseService<UserEntity> {
    UserDTO updateWxInfo(UserDTO userDto);

    /**
+     *
     * 事件修改组织机构信息
     *
-     * @return void
     * @params [dto]
+     * @return void
     * @author liuchuang
     * @since 2020/3/7 1:23
     */
@ -448,4 +450,21 @@ public interface UserService extends BaseService<UserEntity> {
     */
    PageData<UserPointResultDTO> listPoint(Map<String, Object> params);

+    /**
+     * @describe: 通过手机号获取用户信息
+     * @author wangtong
+     * @date 2021/9/23 16:39
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getUserByMobile(String mobile);
+
+    /**
+     * @describe: 志愿组织模块获取用户列表
+     * @author wangtong
+     * @date 2021/9/29 10:33
+     * @params [mobile]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    PageData<UserDTO> getUserListForVolunteerOrg(Map<String, Object> params);
 }
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@ -1677,6 +1677,26 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
        return deptId;
    }

+    @Override
+    public Result getUserByMobile(String mobile) {
+        UserDTO user = baseDao.getUserByMobile(mobile);
+        return new Result().ok(user);
+    }
+
+    @Override
+    public PageData<UserDTO> getUserListForVolunteerOrg(Map<String, Object> params) {
+        //分页
+        IPage<UserEntity> page = getPage(params);
+        //查询
+        List<UserEntity> list = baseDao.getUserListForVolunteerOrg(params);
+        return getPageData(list, page.getTotal(), UserDTO.class);
+//
+//        int pageIndex = (dto.getPage() - NumConstant.ONE) * dto.getLimit();
+//        dto.setPage(pageIndex);
+//        List<UserDTO> user = baseDao.getUserListForVolunteerOrg(dto);
+//        return new Result().ok(user);
+    }
+
    /**
     * 用户信息校验
     *
--- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
+++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
@ -683,6 +683,24 @@ WHERE 1 = 1
        ORDER BY
        u.register_time desc
    </select>
+    <select id="getUserByMobile" resultType="com.elink.esua.epdc.dto.UserDTO">
+        SELECT * FROM `epdc_user`
+            where DEL_FLAG='0'
+			and MOBILE=#{mobile}
+    </select>
+    <select id="getUserListForVolunteerOrg" resultType="com.elink.esua.epdc.entity.UserEntity">
+        select *
+        from epdc_user
+        where DEL_FLAG='0'
+			and state!='0'
+            <if test="realName != null and realName != ''">
+                and REAL_NAME like '%${realName}%'
+            </if>
+            <if test="mobile != null and mobile != ''">
+                and MOBILE like '%${mobile}%'
+            </if>
+        order by CREATED_TIME desc
+    </select>

    <select id="selectListUserPoints" resultType="com.elink.esua.epdc.dto.UserPointsDTO">
        select * from(
--- a/epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml
+++ b/epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml
@ -27,7 +27,7 @@
            ui.SERVICE_AREA,
            ui.RECOMMEND_FLAG
        FROM epdc_user u
-        LEFT JOIN epdc_user_info ui ON u.ID = ui.USER_ID
+        INNER JOIN epdc_user_info ui ON u.ID = ui.USER_ID
        WHERE u.DEL_FLAG = 0
        AND ui.DEL_FLAG = 0
          <if test="realName != '' and realName != null">