diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java index 79961dd..b3fb0be 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java @@ -31,6 +31,15 @@ public class ItemController extends BaseController { return success(itemService.list(page, size, name, tel)); } + @RequestMapping("/groupList") + public Result> groupList() { + int page = parmsUtil.getInteger("page", "页码不能为空"); + int size = parmsUtil.getInteger("size", "页容量不能为空"); + + return success(itemService.groupList(page, size)); + } + + @RequestMapping("/getItemById") public Result getItemById() { Integer id = parmsUtil.getInteger("id"); diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java index c7f32ff..3abe85d 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java @@ -46,6 +46,19 @@ public class ItemService extends BaseService { queryWrapper.eq("tel", tel); } queryWrapper.eq("del_flag", 0); + + queryWrapper.eq("is_group",false); + + return pageHelper(pageNum, pageSize, queryWrapper, itemMapper, "create_datetime", false); + } + + public Page groupList(int pageNum, int pageSize) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.eq("del_flag", 0); + + queryWrapper.eq("is_group",true); + return pageHelper(pageNum, pageSize, queryWrapper, itemMapper, "create_datetime", false); }