|
|
|
@ -961,13 +961,8 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ |
|
|
|
|
|
|
|
|
|
return ServiceResult<ExcelData>.OprateSuccess("导入成功!"); |
|
|
|
|
} |
|
|
|
|
public virtual async Task<ServiceResult<string>> DownloadExcel(string menuName) |
|
|
|
|
public async Task<List<QueryExportColumn>> QueryExportColumn(string menuName) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
var tableNmae = string.Empty; |
|
|
|
|
Type entityType = typeof(TEntity); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var sql = $@"SELECT Row_Number ()
|
|
|
|
|
OVER (ORDER BY CONVERT (INT, rowNum), CONVERT (INT, colNum)) |
|
|
|
|
sortNum, |
|
|
|
@ -994,24 +989,22 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ |
|
|
|
|
AND elementType ! = 'FileUpload' |
|
|
|
|
AND dataType ! = ''";
|
|
|
|
|
|
|
|
|
|
var columns = await Db.Ado.SqlQueryAsync<QueryExportColumn>(sql); |
|
|
|
|
return await Db.Ado.SqlQueryAsync<QueryExportColumn>(sql); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public virtual async Task<ServiceResult<string>> DownloadExcel(string menuName) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
var tableNmae = string.Empty; |
|
|
|
|
Type entityType = typeof(TEntity); |
|
|
|
|
var columns = await QueryExportColumn(menuName); |
|
|
|
|
|
|
|
|
|
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(); |
|
|
|
|
|
|
|
|
|
var path = await ReportHelper.ImportTemplate(Db, columns, dt, menuName); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot"; |
|
|
|
|
//var path = $"{$"{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}ExcelTemplate{Path.DirectorySeparatorChar}"}"; |
|
|
|
|
//if (!Directory.Exists(physicsPath + path)) |
|
|
|
|
// Directory.CreateDirectory(physicsPath + path); |
|
|
|
|
|
|
|
|
|
//Type entityType = typeof(TEntity); |
|
|
|
|
//var fileName = entityType.GetEntityTableName() + ".xlsx"; |
|
|
|
|
//var result = ServiceResult<string>.OprateSuccess(fileName, physicsPath + path + fileName); |
|
|
|
|
var path = ReportHelper.ImportTemplate(Db, columns, dt, menuName); |
|
|
|
|
var result = ServiceResult<string>.OprateSuccess($"{MenuName}_{DateTimeHelper.ConvertToSecondString1(DateTime.Now)}.xlsx", path); |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
@ -1427,7 +1420,7 @@ ORDER BY SortNo ASC"; |
|
|
|
|
default: |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return conditions; |
|
|
|
|
} |
|
|
|
|
public string DealConditions1(string conditions, string name, string value) |
|
|
|
|