diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java index 7ced2ac3..2d89e8a0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.check.domain.LisGroupInfo; public interface ILisGroupInfoAppService { - R getLisGroupInfoList(); + R getLisGroupInfoList(Integer pageNum, Integer pageSize); R add(LisGroupInfo lisGroupInfo); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java index eee03b00..74e110c9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java @@ -1,6 +1,7 @@ package com.openhis.web.check.appservice.impl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.check.domain.LisGroupInfo; import com.openhis.check.service.ILisGroupInfoService; @@ -17,11 +18,14 @@ public class LisGroupInfoAppServiceImpl implements ILisGroupInfoAppService { @Resource private ILisGroupInfoService lisGroupInfoService; @Override - public R getLisGroupInfoList() { - List list = lisGroupInfoService.list(); + public R getLisGroupInfoList(Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + Page list = lisGroupInfoService.page(page); return R.ok(list); } + + @Override public R add(LisGroupInfo lisGroupInfo) { if (ObjectUtil.isEmpty(lisGroupInfo)) { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java index 6eb7f4cb..4d235ef1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java @@ -19,8 +19,8 @@ public class LisGroupInfoController { * * */ @GetMapping("/list") - public R getLisGroupInfoList(){ - return R.ok(lisGroupInfoAppService.getLisGroupInfoList()); + public R getLisGroupInfoList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize){ + return R.ok(lisGroupInfoAppService.getLisGroupInfoList(pageNum, pageSize)); } /* diff --git a/openhis-ui-vue3/src/views/maintainSystem/lisGroup/index.vue b/openhis-ui-vue3/src/views/maintainSystem/lisGroup/index.vue index d5544f43..e85ada26 100644 --- a/openhis-ui-vue3/src/views/maintainSystem/lisGroup/index.vue +++ b/openhis-ui-vue3/src/views/maintainSystem/lisGroup/index.vue @@ -1,6 +1,6 @@