diff --git 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 index 770ab60..d8a65e1 100644 --- 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 @@ -29,6 +29,7 @@ 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.PartyMemberModifyFormDTO; 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.EpdcUserPointsFormDTO; import com.elink.esua.epdc.enums.AppUserStatesEnum; @@ -357,4 +358,18 @@ public class UserController { PageData page = userService.pageForPoints(params); return new Result>().ok(page); } + + /** + * 网格积分排名 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/8/4 13:44 + */ + @GetMapping("pointPage") + public Result> pointPage(@RequestParam Map params) { + PageData page = userService.listPoint(params); + return new Result>().ok(page); + } } diff --git 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 index fb62598..b94dca1 100644 --- 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 @@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.CachingUserInfoDTO; 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.result.*; @@ -295,4 +296,14 @@ public interface UserDao extends BaseDao { * @Date 14:06 2020-06-24 **/ UsersGradeRankingDTO selectCurrentUserGradeRanking(EpdcAppUserGradeRankingFormDTO formDto); + + /** + * 网格社区排名 + * + * @param params + * @return java.lang.Object + * @author qushutong + * @date 2020/8/3 13:43 + */ + List selectListPoints(Map params); } diff --git 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 index 2cb6910..c5ccb06 100644 --- 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 @@ -438,4 +438,14 @@ public interface UserService extends BaseService { **/ Result listUsersGradeRanking(EpdcAppUserGradeRankingFormDTO formDto); + /** + * 网络积分排名 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/8/3 13:41 + */ + PageData listPoint(Map params); + } diff --git 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 index 183d7fe..fe73b81 100644 --- 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 @@ -40,6 +40,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.config.StreamUtils; import com.elink.esua.epdc.constant.AuthenticatedConsant; @@ -1637,6 +1638,16 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().ok(rangking); } + @Override + public PageData listPoint(Map params) { + // 查询当前用户所具有的的数据权限 + List deptIdList = SecurityUser.getUser().getDeptIdList(); + params.put("deptIdList", deptIdList); + IPage iPage = this.getPage(params); + List userPointResultList = baseDao.selectListPoints(params); + return new PageData<>(userPointResultList, iPage.getTotal()); + } + /** * 获取【排好序】的 用户等级排行榜数据 * diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml index c55b891..b920e19 100644 --- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml +++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml @@ -829,4 +829,101 @@ WHERE 1 = 1 ) userRanking WHERE userRanking.POINTS_TOTLE = #{pointsTotle} + +