From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 15 +++++++++++++--
1 files changed, 13 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 dddb479..6b79a8d 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,10 +53,10 @@
* 鏍规嵁瀹犵墿id鑾峰彇鐩稿叧澶囧繕褰�
*/
@GetMapping
- public AjaxResult getByPetId(@PathParam("pid")String 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);
+ return zfPetNoteService.getAllPetNoteByPetId(pageNum,pageSize,pid,zfPetNote);
}
@@ -85,6 +85,17 @@
util.exportExcel(response, list, "榄呭疇澶囧繕褰曡褰曟暟鎹�");
}
+ @Log(title = "榄呭疇澶囧繕褰曡褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response, ZfPetNote zfPetNote, @PathVariable Long[] ids)
+ {
+ List<ZfPetNote> list = zfPetNoteService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
+ util.exportExcel(response, list, "榄呭疇澶囧繕褰曡褰曟暟鎹�");
+ }
+
+
/**
* 瀵煎叆榄呭疇澶囧繕褰曡褰曞垪琛�
*/
--
Gitblit v1.9.1