From 351bd761494b9c75701f8e3736e49e30bd22b436 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 27 Nov 2023 13:50:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=B9=A6=E7=B1=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BookMedicalRecordsController.java | 3 ++- .../peanut/modules/book/dao/BookMedicalRecordsDao.java | 2 ++ .../modules/book/service/BookMedicalRecordsService.java | 2 ++ .../book/service/impl/BookMedicalRecordsServiceImpl.java | 5 +++++ src/main/resources/mapper/book/BookMedicalRecordsDao.xml | 8 ++++++++ 5 files changed, 19 insertions(+), 1 deletion(-) 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..ee889457 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java @@ -59,9 +59,10 @@ 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); } 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 From 218df5ac3135ba47954a324e0507cef82683754e Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 27 Nov 2023 14:20:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=B9=A6=E7=B1=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/book/BookMedicalRecordsDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/book/BookMedicalRecordsDao.xml b/src/main/resources/mapper/book/BookMedicalRecordsDao.xml index fc831a99..8c80db9c 100644 --- a/src/main/resources/mapper/book/BookMedicalRecordsDao.xml +++ b/src/main/resources/mapper/book/BookMedicalRecordsDao.xml @@ -18,7 +18,7 @@ select b.* from book_medical_records bmr left join book b on bmr.book_id = b.id where bmr.book_id not in (select book_id from user_ebook_buy where user_id = #{userId}) - and b.del_flag = 0 and b.state = 1 + and bmr.del_flag = 0 and b.del_flag = 0 and b.state = 1 GROUP BY bmr.book_id limit #{page},#{limit} @@ -28,7 +28,7 @@ select distinct book_id from book_medical_records bmr left join book b on bmr.book_id = b.id where bmr.book_id not in (select book_id from user_ebook_buy where user_id = #{userId}) - and b.del_flag = 0 and b.state = 1) t + and bmr.del_flag = 0 and b.del_flag = 0 and b.state = 1) t \ No newline at end of file From fdf84e52b9b9a63b0b4b38c4e5560ab277902243 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 27 Nov 2023 14:54:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=9B=BE=E4=B9=A6=E6=9F=A5=E5=8C=BB=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookMedicalRecordsController.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) 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 ee889457..6d6ed2d9 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java @@ -66,29 +66,18 @@ public class BookMedicalRecordsController { 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查询医案