diff --git a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java index dd444939..6d6ed2d9 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java @@ -59,35 +59,25 @@ public class BookMedicalRecordsController { @RequestMapping("/recommendBookList") public R recommendBookList(@RequestBody Map params){ List list = bookMedicalRecordsService.getBooks(params); + int count = bookMedicalRecordsService.getCount((Integer) params.get("userId")); Page page = new Page<>(); page.setRecords(list); - page.setTotal(list.size()); + page.setTotal(count); page.setPages((int)Math.ceil(list.size()/page.getSize())); return R.ok().put("page", page); } - /** - * 列表 - */ - @RequestMapping("/list") - public R list(@RequestBody Map params){ - IPage page = bookMedicalRecordsService.page( - new Query().getPage(params), - new QueryWrapper() - .orderByDesc("sort") - .eq("del_flag","0")); - return R.ok().put("page", page); - } /** * 根据图书id查询列表 */ @RequestMapping("/listByBookId") - public R listByBookId(Integer bookId){ - List list = bookMedicalRecordsService.list( + public R listByBookId(@RequestBody Map params){ + IPage page = bookMedicalRecordsService.page( + new Query().getPage(params), new QueryWrapper() - .eq("book_id", bookId) + .eq("book_id", params.get("bookId")) .eq("del_flag","0") .orderByDesc("sort")); - return R.ok().put("list", list); + return R.ok().put("page", page); } /** * 根据id查询医案 diff --git a/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java b/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java index baa005e5..acded059 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java @@ -15,4 +15,6 @@ public interface BookMedicalRecordsDao extends MPJBaseMapper getBooks(Integer page,Integer limit,Integer userId); + int getCount(Integer userId); + } diff --git a/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java b/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java index c9d6c745..dbea6653 100644 --- a/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java +++ b/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java @@ -14,4 +14,6 @@ public interface BookMedicalRecordsService extends IService getBooks(Map params); + int getCount(Integer userId); + } diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java index 7164dd0f..4eefee5e 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java @@ -30,4 +30,9 @@ public class BookMedicalRecordsServiceImpl extends ServiceImpl + + \ No newline at end of file