From dfdd4bd5d112a17ccd1483ad11fe023817d54d26 Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期六, 22 七月 2023 15:20:13 +0800 Subject: [PATCH] 45648 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java index b018a3e..9ee1cb5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java @@ -53,8 +53,10 @@ * 鏍规嵁瀹犵墿id鑾峰彇鐩稿叧澶囧繕褰� */ @GetMapping - public AjaxResult getByPetId(@PathParam("pid")Long pid){ - return zfPetNoteService.getAllPetNoteByPetId(pid); + public AjaxResult getByPetId(@PathParam("pid")String pid,ZfPetNote zfPetNote){ + Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfPetNoteService.getAllPetNoteByPetId(pageNum,pageSize,pid,zfPetNote); } @@ -88,7 +90,7 @@ */ @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT) @PostMapping("/importData/{pid}") - public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable Long pid) throws Exception + public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable String pid) throws Exception { ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class); List<ZfPetNote> eventList = util.importExcel(file.getInputStream()); -- Gitblit v1.9.1