diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs index 6ced86b93..3deeba866 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs @@ -321,6 +321,8 @@ namespace Learun.Application.Organization excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "f_description", ExcelColumn = "说明" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "f_createdate", ExcelColumn = "创建日期" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "f_createusername", ExcelColumn = "创建人" }); + + excelconfig.SpecialColumnEntity = new List(); //调用导出方法 ExcelHelper.ExcelDownload(exportTable, excelconfig); } @@ -367,6 +369,8 @@ namespace Learun.Application.Organization excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "f_description", ExcelColumn = "说明" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "f_createdate", ExcelColumn = "创建日期" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "f_createusername", ExcelColumn = "创建人" }); + + excelconfig.SpecialColumnEntity = new List(); //调用导出方法 ExcelHelper.ExcelDownload(exportTable, excelconfig); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs index 063752727..3f4b6b53c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs @@ -208,6 +208,8 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "aiownership", ExcelColumn = "权属证号" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "landusetype", ExcelColumn = "土地使用权类型" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "landuseuser", ExcelColumn = "土地使用权人/房屋所有权人" }); + + excelconfig.SpecialColumnEntity = new List(); //调用导出方法 ExcelHelper.ExcelDownload(exportTable, excelconfig); return Success("导出成功"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 905be20de..1f7fb67e6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -792,6 +792,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers excelconfig.ColumnEntity.Add(new ColumnModel() { Column = lessonTempItem.value, ExcelColumn = lessonTempItem.text }); } + excelconfig.SpecialColumnEntity = new List(); //调用导出方法 ExcelHelper.ExcelDownload(exportTable, excelconfig); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonType/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonType/Index.cshtml index 492bfbadb..a5977e29d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonType/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonType/Index.cshtml @@ -2,6 +2,11 @@ ViewBag.Title = "课程类型"; Layout = "~/Views/Shared/_Index.cshtml"; } +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs index 81b083eb5..3f4b134d0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs @@ -334,6 +334,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers excelconfig.FileName = Server.UrlDecode("未导入错误数据【" + fileName + "】") + ".xls"; excelconfig.IsAllSizeColumn = true; excelconfig.ColumnEntity = new List(); + excelconfig.SpecialColumnEntity = new List(); //表头 DataTable dt = excelImportIBLL.GetImportError(fileId); foreach (DataColumn col in dt.Columns) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs index e03d43a2f..d4e7bec3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs @@ -311,6 +311,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers }); dt.Columns.Add(item.STIName, typeof(string)); } + + excelConfig.SpecialColumnEntity = new List(); ExcelHelper.ExcelDownload(dt, excelConfig); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UtilityController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UtilityController.cs index c46d958fb..44a7d73f7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UtilityController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UtilityController.cs @@ -359,6 +359,7 @@ namespace Learun.Application.Web.Controllers excelconfig.FileName = Server.UrlDecode(fileName) + ".xls"; excelconfig.IsAllSizeColumn = true; excelconfig.ColumnEntity = new List(); + excelconfig.SpecialColumnEntity = new List(); //表头 List columnList = columnJson.ToList(); //行数据