From 672811c5b1e1bb73845278ec07d9262d9dc40f7f Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期四, 09 四月 2026 11:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

---
 service/src/main/java/com/ruoyi/cwgl/controller/FundFlowController.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/FundFlowController.java b/service/src/main/java/com/ruoyi/cwgl/controller/FundFlowController.java
index 7f05682..337782d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/FundFlowController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/FundFlowController.java
@@ -19,6 +19,7 @@
 import com.ruoyi.cwgl.domain.FundFlow;
 import com.ruoyi.cwgl.service.IFundFlowService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
@@ -116,4 +117,29 @@
     {
         return toAjax(fundFlowService.confirmFundFlow(id));
     }
+
+    /**
+     * 瀵煎叆璧勯噾娴佹按Excel
+     */
+    @PreAuthorize("@ss.hasPermi('cwgl:fundFlow:import')")
+    @Log(title = "璧勯噾娴佹按", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file ) throws Exception
+    {
+        ExcelUtil<FundFlow> util = new ExcelUtil<FundFlow>(FundFlow.class);
+        List<FundFlow> fundFlowList = util.importExcel(file.getInputStream());
+        String message = fundFlowService.importFundFlow(fundFlowList);
+        return AjaxResult.success(message);
+    }
+
+    /**
+     * 涓嬭浇瀵煎叆璧勯噾娴佹按妯℃澘
+     */
+    @PreAuthorize("@ss.hasPermi('cwgl:fundFlow:import')")
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate(String exportKey)
+    {
+        fundFlowService.importTemplate(exportKey);
+        return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
+    }
 }

--
Gitblit v1.8.0