From 81797125f29d6dfd85a07b887e38432d6aa9c02f Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 8 Aug 2024 13:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Excel=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs | 2 +-
 Tiobon.Core.Common/Helper/NPOIHelper.cs                   | 3 ---
 Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs        | 2 +-
 Tiobon.Core.Model/ViewModels/Extend/ExcelData.cs          | 1 +
 Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs          | 7 +++++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs
index f301823f..9bd90c76 100644
--- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs
@@ -63,7 +63,7 @@ public class Ghre_CourseController : BaseController<IGhre_CourseServices, Ghre_C
     #endregion
 
     [HttpPost, Route("ExportExcel/{status}")]
-    public async Task<ServiceResult<string>> ExportExcel([FromBody] QueryExport body, string status)
+    public async Task<ServiceResult<ExcelData>> ExportExcel([FromBody] QueryExport body, string status)
     {
         return await _service.ExportExcel(body, status);
     }
diff --git a/Tiobon.Core.Common/Helper/NPOIHelper.cs b/Tiobon.Core.Common/Helper/NPOIHelper.cs
index 8fdfe239..1b06a914 100644
--- a/Tiobon.Core.Common/Helper/NPOIHelper.cs
+++ b/Tiobon.Core.Common/Helper/NPOIHelper.cs
@@ -1,12 +1,9 @@
 using System.Data;
-using System.IO;
 using System.Text;
 using NPOI.HPSF;
 using NPOI.HSSF.UserModel;
-using NPOI.OpenXmlFormats.Spreadsheet;
 using NPOI.SS.UserModel;
 using NPOI.XSSF.UserModel;
-using RestSharp;
 
 namespace Tiobon.Core.Common.Helper;
 
diff --git a/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs
index 6949c157..69906497 100644
--- a/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs
+++ b/Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs
@@ -18,7 +18,7 @@ namespace Tiobon.Core.IServices
         Task<ServiceResult> UpdateStatus(long[] ids, string status);
         Task<ServiceResult<CommonSelect>> GetSelectAsync(long? linkId, string keyWords);
 
-        Task<ServiceResult<string>> ExportExcel(QueryExport body, string status);
+        Task<ServiceResult<ExcelData>> ExportExcel(QueryExport body, string status);
 
         Task<ServiceResult<CoursePublicSearch>> QueryPublicSearchFields(QueryBody body);
 
diff --git a/Tiobon.Core.Model/ViewModels/Extend/ExcelData.cs b/Tiobon.Core.Model/ViewModels/Extend/ExcelData.cs
index d2fceb35..ac06ad33 100644
--- a/Tiobon.Core.Model/ViewModels/Extend/ExcelData.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/ExcelData.cs
@@ -5,4 +5,5 @@ public class ExcelData
     public int SuccessCount { get; set; } = 0;
     public int ErrorCount { get; set; } = 0;
     public string filePath { get; set; }
+    public string fileName { get; set; }
 }
\ No newline at end of file
diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
index e4b0bcf9..8b1d8f43 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
@@ -486,7 +486,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
     #endregion
 
 
-    public async Task<ServiceResult<string>> ExportExcel(QueryExport body, string status)
+    public async Task<ServiceResult<ExcelData>> ExportExcel(QueryExport body, string status)
     {
         QueryBody filter = new QueryBody();
         filter.pageNum = 1;
@@ -531,7 +531,10 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
 
         path = path + body.exportSet.TitleName + ".xlsx";
         NPOIHelper.ExportExcel(dt, body.exportSet.TitleName, "sheet1", physicsPath + path);
-        return ServiceResult<string>.OprateSuccess("导出成功", path);
+        var result = new ExcelData();
+        result.filePath = path;
+        result.fileName = body.exportSet.TitleName + ".xlsx";
+        return ServiceResult<ExcelData>.OprateSuccess("导出成功", result);
     }
 
     #region 获取公开课查询条件