From 7d0efb63055a8fca7aead8e95330603e64b34acd Mon Sep 17 00:00:00 2001
From: zxy <zxy@DESKTOP-D2A7BVU>
Date: Sat, 31 May 2025 16:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CheryRecurringJobInputPageController.cs   | 17 ++++++++++------
 .../CheryRecurringJobOutPageController.cs     | 18 ++++++++++-------
 .../Controllers/NormalBaseController.cs       | 20 +++++++++++++------
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
index 1dcfec3..e106cb0 100644
--- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
+++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
@@ -286,17 +286,22 @@ namespace TaskManager.Controllers
                 var bytes = await importer.GenerateTemplateBytes<T>();
 
 
-                using var stream = new MemoryStream(bytes);
-                stream.Seek(0, SeekOrigin.Begin);
+                //using var stream = new MemoryStream(bytes);
+                //stream.Seek(0, SeekOrigin.Begin);
 
                 // 设置友好的文件名，例如："导入模板_20250530.xlsx"
                 var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx";
 
                 // 返回文件流结果
-                return File(
-                    fileStream: stream,
-                    contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-                    fileDownloadName: fileName);
+
+                return new FileStreamResult(new MemoryStream(bytes), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
+
+
+
+                //return File(
+                //    fileStream: stream,
+                //    contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                //    fileDownloadName: fileName);
             }
             catch (Exception ex)
             {
diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
index 9908581..2e5509b 100644
--- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
+++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
@@ -405,17 +405,22 @@ namespace TaskManager.Controllers
                 var bytes = await importer.GenerateTemplateBytes<T>();
 
 
-                using var stream = new MemoryStream(bytes);
-                stream.Seek(0, SeekOrigin.Begin);
+                //using var stream = new MemoryStream(bytes);
+                //stream.Seek(0, SeekOrigin.Begin);
 
                 // 设置友好的文件名，例如："导入模板_20250530.xlsx"
                 var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx";
 
                 // 返回文件流结果
-                return File(
-                    fileStream: stream,
-                    contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-                    fileDownloadName: fileName);
+
+                return new FileStreamResult(new MemoryStream(bytes), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
+
+
+
+                //return File(
+                //    fileStream: stream,
+                //    contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                //    fileDownloadName: fileName);
             }
             catch (Exception ex)
             {
@@ -432,7 +437,6 @@ namespace TaskManager.Controllers
 
 
 
-
     }
     public class CustomDateTimeConverter : JsonConverter<DateTime>
     {
diff --git a/API/Wood.Service/Controllers/NormalBaseController.cs b/API/Wood.Service/Controllers/NormalBaseController.cs
index 978aa11..c8bd625 100644
--- a/API/Wood.Service/Controllers/NormalBaseController.cs
+++ b/API/Wood.Service/Controllers/NormalBaseController.cs
@@ -151,6 +151,9 @@ namespace Wood.Service.Controllers
             var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
             var res = await excelExporter.ExportAsByteArray(dtos);
             return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
+        
+        
+        
         }
 
 
@@ -169,17 +172,22 @@ namespace Wood.Service.Controllers
                 var bytes = await importer.GenerateTemplateBytes<T>();
                
                 
-                using var stream = new MemoryStream(bytes);
-                stream.Seek(0, SeekOrigin.Begin);
+                //using var stream = new MemoryStream(bytes);
+                //stream.Seek(0, SeekOrigin.Begin);
 
                 // 设置友好的文件名，例如："导入模板_20250530.xlsx"
                 var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx";
 
                 // 返回文件流结果
-                return File(
-                    fileStream: stream,
-                    contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-                    fileDownloadName: fileName);
+
+               return  new FileStreamResult(new MemoryStream(bytes), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
+
+
+
+                //return File(
+                //    fileStream: stream,
+                //    contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                //    fileDownloadName: fileName);
             }
             catch (Exception ex)
             {