Browse Source

修改成分页

wangfeng 4 years ago
parent
commit
2623a46b70

+ 5 - 3
cdssman-service/src/main/java/com/diagbot/facade/UserRoleFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserHospital;
@@ -67,8 +68,9 @@ public class UserRoleFacade extends UserRoleServiceImpl {
         return res;
     }
 
-    public List<UserRoleInfoFindDTO> getUserRoles(UserRoleInfoFindVO userRoleInfoFindVO) {
-        List<UserRoleInfoFindDTO> dataAll = userRoleService.getUserRoleAlls(userRoleInfoFindVO);
+    public IPage<UserRoleInfoFindDTO> getUserRoles(UserRoleInfoFindVO userRoleInfoFindVO) {
+        IPage<UserRoleInfoFindDTO> dataAllIPage = userRoleService.getUserRoleAlls(userRoleInfoFindVO);
+        List<UserRoleInfoFindDTO> dataAll = dataAllIPage.getRecords();
         List<Long> hospitalId = new ArrayList<>();
         for (UserRoleInfoFindDTO data : dataAll) {
             hospitalId.add(data.getHospitalId());
@@ -77,7 +79,7 @@ public class UserRoleFacade extends UserRoleServiceImpl {
         for (UserRoleInfoFindDTO userData : dataAll) {
             userData.setHospitalName(hospitalInfoData.get(userData.getHospitalId()));
         }
-        return dataAll;
+        return dataAllIPage.setRecords(dataAll);
     }
 
     /**

+ 2 - 1
cdssman-service/src/main/java/com/diagbot/mapper/UserRoleMapper.java

@@ -1,5 +1,6 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.UserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,5 +18,5 @@ import java.util.List;
  */
 public interface UserRoleMapper extends BaseMapper<UserRole> {
 
-    List<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO);
+    IPage<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO);
 }

+ 2 - 1
cdssman-service/src/main/java/com/diagbot/service/UserRoleService.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.UserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,5 +18,5 @@ import java.util.List;
  */
 public interface UserRoleService extends IService<UserRole> {
 
-    List<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO);
+    IPage<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO);
 }

+ 2 - 1
cdssman-service/src/main/java/com/diagbot/service/impl/UserRoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.UserRole;
 import com.diagbot.mapper.UserRoleMapper;
@@ -22,7 +23,7 @@ import java.util.List;
 public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
 
     @Override
-    public List<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO) {
+    public IPage<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO) {
         return baseMapper.getUserRoleAlls(userRoleInfoFindVO);
     }
 }

+ 2 - 1
cdssman-service/src/main/java/com/diagbot/vo/UserRoleInfoFindVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,6 +11,6 @@ import lombok.Setter;
  */
 @Setter
 @Getter
-public class UserRoleInfoFindVO {
+public class UserRoleInfoFindVO extends Page {
     private Long hospitalId;
 }

+ 2 - 2
cdssman-service/src/main/java/com/diagbot/web/UserRoleController.java

@@ -54,8 +54,8 @@ public class UserRoleController {
     @PostMapping("/getUserRole")
     @SysLogger("getUserRole")
     @Transactional
-    public RespDTO<List<UserRoleInfoFindDTO>> getUserRole(@RequestBody @Valid UserRoleInfoFindVO userRoleInfoFindVO) {
-        List<UserRoleInfoFindDTO> data = userRoleFacade.getUserRoles(userRoleInfoFindVO);
+    public RespDTO<IPage<UserRoleInfoFindDTO>> getUserRole(@RequestBody @Valid UserRoleInfoFindVO userRoleInfoFindVO) {
+        IPage<UserRoleInfoFindDTO> data = userRoleFacade.getUserRoles(userRoleInfoFindVO);
         return RespDTO.onSuc(data);
     }