处理分页

src/main/java/com/imed/costaccount/service/CostAccountShareService.java

@@ -21,12 +21,12 @@ import java.util.List;
 public interface CostAccountShareService extends IService<CostAccountShare> {
     /**
      * 分页查询责任中心成本对照相关数据
-     * @param page
+     * @param current
      * @param pageSize
      * @param name
      * @return
      */
-    PageUtils queryList(Integer page, Integer pageSize, String name,Integer hospId);
+    PageUtils queryList(Integer current, Integer pageSize, String name,Integer hospId);
 
     /**
      * 保存责任中心成本对照表

src/main/java/com/imed/costaccount/service/CostShareLevelService.java

@@ -19,13 +19,13 @@ import java.util.List;
 public interface CostShareLevelService extends IService<CostShareLevel> {
     /**
      * 分页查询相关分摊层级信息
-     * @param page
+     * @param current
      * @param pageSize
      * @param name
      * @param hospId
      * @return
      */
-    PageUtils queryList(Integer page, Integer pageSize, String name, Integer hospId);
+    PageUtils queryList(Integer current, Integer pageSize, String name, Integer hospId);
 
     /**
      * 保存

src/main/java/com/imed/costaccount/service/CostShareParamService.java

@@ -20,12 +20,12 @@ import java.util.List;
 public interface CostShareParamService extends IService<CostShareParam> {
     /**
      * 分页查询相关的分摊参数数据
-     * @param page
+     * @param current
      * @param pageSize
      * @param name
      * @return
      */
-    PageUtils queryList(Integer page, Integer pageSize, String name,Integer hospId);
+    PageUtils queryList(Integer current, Integer pageSize, String name,Integer hospId);
 
     /**
      * 保存分摊参数

src/main/java/com/imed/costaccount/service/HospitalService.java

@@ -35,11 +35,11 @@ public interface HospitalService extends IService<Hospital> {
 
     /**
      * 分页查询所有的医院信息
-     * @param page
+     * @param current
      * @param pageSize
      * @return
      */
-    PageUtils queryList(Integer page, Integer pageSize,Integer hospId, String name);
+    PageUtils queryList(Integer current, Integer pageSize,Integer hospId, String name);
 
     /**
      * 添加医院信息

src/main/java/com/imed/costaccount/service/impl/CostAccountShareServiceImpl.java

@@ -52,14 +52,14 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
     /**
      * 分页查询责任中心成本对照相关数据
      *
-     * @param page
+     * @param current
      * @param pageSize
      * @param name
      * @return
      */
     @Override
-    public PageUtils queryList(Integer page, Integer pageSize, String name, Integer hospId) {
-        Page<CostAccountShare> costAccountSharePage = new Page<>(page, pageSize);
+    public PageUtils queryList(Integer current, Integer pageSize, String name, Integer hospId) {
+        Page<CostAccountShare> costAccountSharePage = new Page<>(current, pageSize);
         Page<CostAccountShare> pages = this.page(costAccountSharePage, new QueryWrapper<CostAccountShare>().lambda()
                 .eq(!StringUtils.isEmpty(hospId), CostAccountShare::getHospId, hospId)
                 .like(!StringUtils.isEmpty(name), CostAccountShare::getResponsibilityName, name)

src/main/java/com/imed/costaccount/service/impl/CostShareLevelServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
-import com.imed.costaccount.constants.NumberConstant;
 import com.imed.costaccount.mapper.CostShareLevelMapper;
 import com.imed.costaccount.model.CostShareLevel;
 import com.imed.costaccount.model.User;
@@ -31,15 +30,15 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
     /**
      * 分页查询相关分摊层级信息
      *
-     * @param page
+     * @param current
      * @param pageSize
      * @param name
      * @param hospId
      * @return
      */
     @Override
-    public PageUtils queryList(Integer page, Integer pageSize, String name, Integer hospId) {
-        Page<CostShareLevel> costShareLevelPage = new Page<>(page, pageSize);
+    public PageUtils queryList(Integer current, Integer pageSize, String name, Integer hospId) {
+        Page<CostShareLevel> costShareLevelPage = new Page<>(current, pageSize);
         Page<CostShareLevel> pages = this.page(costShareLevelPage, new QueryWrapper<CostShareLevel>().lambda()
                 .eq(!StringUtils.isEmpty(hospId), CostShareLevel::getHospId, hospId)
                 .like(!StringUtils.isEmpty(name), CostShareLevel::getShareName, name)

src/main/java/com/imed/costaccount/service/impl/CostShareParamServiceImpl.java

@@ -42,8 +42,8 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
      * @return
      */
     @Override
-    public PageUtils queryList(Integer page, Integer pageSize, String name,Integer hospId) {
-        Page<CostShareParam> costShareParamPage = new Page<>(page, pageSize);
+    public PageUtils queryList(Integer current, Integer pageSize, String name,Integer hospId) {
+        Page<CostShareParam> costShareParamPage = new Page<>(current, pageSize);
         Page<CostShareParam> pages = this.page(costShareParamPage, new QueryWrapper<CostShareParam>().lambda()
                 .eq(!StringUtils.isEmpty(hospId), CostShareParam::getHospId, hospId)
                 .like(!StringUtils.isEmpty(name), CostShareParam::getShareParamName, name));

src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -42,8 +42,8 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
      * @return
      */
     @Override
-    public PageUtils queryList(Integer page, Integer pageSize, Integer hospId, String name) {
-        Page<Hospital> hosptailPage = new Page<>(page, pageSize);
+    public PageUtils queryList(Integer current, Integer pageSize, Integer hospId, String name) {
+        Page<Hospital> hosptailPage = new Page<>(current, pageSize);
         Page<Hospital> pages = this.page(hosptailPage, new QueryWrapper<Hospital>().lambda()
 //                .eq(!StringUtils.isEmpty(hospId), Hospital::getId, hospId)
                 .like(!StringUtils.isEmpty(name), Hospital::getName, name));

src/main/java/com/imed/costaccount/web/CostAccountShareController.java

@@ -39,12 +39,12 @@ public class CostAccountShareController {
      */
     @GetMapping("/list")
     @ApiOperation("分页获取责任中心成本数据")
-    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+    public Result list(@RequestParam(defaultValue = "1", value = "current") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name", required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();
-        PageUtils pageUtils = costAccountShareService.queryList(page,pageSize,name,hospId);
+        PageUtils pageUtils = costAccountShareService.queryList(current,pageSize,name,hospId);
         return Result.ok(pageUtils);
     }
 

src/main/java/com/imed/costaccount/web/CostResponsibilityDepartmentController.java

@@ -32,7 +32,7 @@ public class CostResponsibilityDepartmentController {
      * 分页查询列表
      */
     @GetMapping("/list")
-    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+    public Result list(@RequestParam(defaultValue = "1", value = "current") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         return Result.ok();

src/main/java/com/imed/costaccount/web/CostShareLevelController.java

@@ -36,12 +36,12 @@ public class CostShareLevelController {
      */
     @GetMapping("/list")
     @ApiOperation("分页查询分摊层级数据")
-    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+    public Result list(@RequestParam(defaultValue = "1", value = "current") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name", required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();
-        PageUtils pageUtils= costShareLevelService.queryList(page,pageSize,name,hospId);
+        PageUtils pageUtils= costShareLevelService.queryList(current,pageSize,name,hospId);
         return Result.ok(pageUtils);
     }
 

src/main/java/com/imed/costaccount/web/CostShareParamController.java

@@ -38,12 +38,12 @@ public class CostShareParamController {
      */
     @GetMapping("/list")
     @ApiOperation("分页查询成本分摊相关参数")
-    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+    public Result list(@RequestParam(defaultValue = "1", value = "current") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                         @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();
-        PageUtils pageUtils= costShareParamService.queryList(page,pageSize,name,hospId);
+        PageUtils pageUtils= costShareParamService.queryList(current,pageSize,name,hospId);
         return Result.ok(pageUtils);
     }
 

src/main/java/com/imed/costaccount/web/HospitalController.java

@@ -47,12 +47,12 @@ public class HospitalController {
      */
     @GetMapping("/list")
     @ApiOperation("分页查询医院信息")
-    public Result list(@RequestParam(value = "page", defaultValue = "1") Integer page,
+    public Result list(@RequestParam(value = "current", defaultValue = "1") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();
-        PageUtils pageUtils = hospitalService.queryList(page,pageSize,hospId,name);
+        PageUtils pageUtils = hospitalService.queryList(current,pageSize,hospId,name);
         return Result.ok(pageUtils);
     }
 

src/main/java/com/imed/costaccount/web/ProductController.java

@@ -39,11 +39,11 @@ public class ProductController {
      */
     @ApiOperation("成本项目列表")
     @GetMapping("/list")
-    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+    public Result list(@RequestParam(defaultValue = "1", value = "current") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name", required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        PageUtils pageUtils = productService.selectList(page, pageSize,name, user);
+        PageUtils pageUtils = productService.selectList(current, pageSize,name, user);
         return Result.ok(pageUtils);
     }
 

src/main/java/com/imed/costaccount/web/UserController.java

@@ -31,17 +31,17 @@ public class UserController {
 
     /**
      *  分页查询用户的信息数据
-     * @param page
+     * @param current
      * @param pageSize
      * @return
      */
     @GetMapping("/list")
     @ApiOperation("分页查询用户的信息")
-    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+    public Result list(@RequestParam(defaultValue = "1", value = "current") Integer current,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        PageUtils pageUtils = userService.queryList(page,pageSize,user.getHospId(),name);
+        PageUtils pageUtils = userService.queryList(current,pageSize,user.getHospId(),name);
         return Result.ok(pageUtils);
     }