From 150b8d2d049ceb69cb301d12c38aae190c21a05c Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 13 五月 2023 21:52:36 +0800
Subject: [PATCH] 1

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java |   21 +++++++++++++++++++--
 1 files changed, 19 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 90ee3e9..a9c0085 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
@@ -8,6 +8,7 @@
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZfPet;
 import com.ruoyi.domain.ZfPetNote;
 import com.ruoyi.domain.ZfProperty;
 import com.ruoyi.service.ZfPetNoteService;
@@ -20,6 +21,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.server.PathParam;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -55,6 +57,18 @@
         return zfPetNoteService.getAllPetNoteByPetId(pid);
     }
 
+
+    /**
+     * 鑾峰彇瀵煎叆妯℃澘
+     */
+    @GetMapping("/model")
+    public void getExportModel(HttpServletResponse response){
+        List<ZfPetNote> list = Collections.singletonList(new ZfPetNote());
+        ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
+        util.exportExcel(response,list,"榄呭疇澶囧繕褰曡褰曟暟鎹�");
+    }
+
+
     /**
      * 瀵煎嚭榄呭疇澶囧繕褰曡褰曞垪琛�
      */
@@ -73,11 +87,14 @@
      * 瀵煎叆榄呭疇澶囧繕褰曡褰曞垪琛�
      */
     @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT)
-    @PostMapping("/importData")
-    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+    @PostMapping("/importData/{pid}")
+    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable Long pid) throws Exception
     {
         ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
         List<ZfPetNote> eventList = util.importExcel(file.getInputStream());
+        for (ZfPetNote zfPetNote : eventList) {
+            zfPetNote.setPid(pid);
+        }
         log.info("榄呭疇澶囧繕褰曞垪琛ㄤ负锛歿}",eventList);
 
         if (zfPetNoteService.saveBatch(eventList)) {

--
Gitblit v1.9.1