From df6b610c57536058d1292a086d56e49dab0acf46 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期四, 25 五月 2023 20:12:37 +0800
Subject: [PATCH] 456
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 a9c0085..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,19 +53,21 @@
* 鏍规嵁瀹犵墿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);
}
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfPetNote> list = Collections.singletonList(new ZfPetNote());
ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
- util.exportExcel(response,list,"榄呭疇澶囧繕褰曡褰曟暟鎹�");
+ util.exportExcel(response,list,"榄呭疇澶囧繕褰曞鍏ユā鏉�");
}
@@ -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