diff --git a/Tiobon.Core.DataAccess/ReportHelper.cs b/Tiobon.Core.DataAccess/ReportHelper.cs index e5803809..8d9514b3 100644 --- a/Tiobon.Core.DataAccess/ReportHelper.cs +++ b/Tiobon.Core.DataAccess/ReportHelper.cs @@ -107,7 +107,7 @@ public static class ReportHelper #endregion - public static async Task ImportTemplate(ISqlSugarClient Db, List tableColumn, DataTable dt, string menuName) + public static async Task ImportTemplate(ISqlSugarClient Db, List tableColumn, DataTable dt, string menuName) { //生成表格 @@ -341,11 +341,13 @@ public static class ReportHelper fs.Write(buf, 0, buf.Length); fs.Flush(); } + + return filepath + fname; } catch (Exception ex) { } - return default(long); + return default(string); } /// /// Excel字段下拉 diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index f4a7ce32..bb6edf3f 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -979,11 +979,12 @@ public class BaseServices : IBaseServ var columns = await Db.Ado.SqlQueryAsync(sql); - var dt = await Db.Ado.GetDataTableAsync("SELECT * FROM " + entityType.GetEntityTableName() + " WHERE IsEnable=1"); + var dt = await Db.Ado.GetDataTableAsync("SELECT TOP 1 * FROM " + entityType.GetEntityTableName() + " WHERE IsEnable=1"); + var MenuName = await Db.Ado.GetStringAsync($"SELECT MenuName FROM Ghrs_Menu WHERE MenuNo = '{menuName}'"); //columns = columns.WhereIF(param.exportSet.ExFields.Any(), x => param.exportSet.ExFields.Contains(x.field)).ToList(); - - await ReportHelper.ImportTemplate(Db, columns, dt, menuName); + + var path = await ReportHelper.ImportTemplate(Db, columns, dt, menuName); //var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot"; @@ -994,7 +995,7 @@ public class BaseServices : IBaseServ //Type entityType = typeof(TEntity); //var fileName = entityType.GetEntityTableName() + ".xlsx"; //var result = ServiceResult.OprateSuccess(fileName, physicsPath + path + fileName); - var result = ServiceResult.OprateSuccess(null, null); + var result = ServiceResult.OprateSuccess($"{MenuName}.xlsx", path); return result; }