From e15c73ef6313c335d31173f2b14be3843e786156 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 23 五月 2023 18:12:24 +0800
Subject: [PATCH] 456
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 ee1f042..dddb479 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
@@ -54,7 +54,9 @@
*/
@GetMapping
public AjaxResult getByPetId(@PathParam("pid")String pid){
- return zfPetNoteService.getAllPetNoteByPetId(pid);
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfPetNoteService.getAllPetNoteByPetId(pageNum,pageSize,pid);
}
@@ -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