Browse Source

【修改】导入、导出修改;

金隅分支
dyy 2 years ago
parent
commit
9312ec942d
7 changed files with 16 additions and 0 deletions
  1. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs
  2. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs
  3. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs
  4. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonType/Index.cshtml
  5. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs
  6. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs
  7. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UtilityController.cs

+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs View File

@@ -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<SpecialColumnModel>();
//调用导出方法
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<SpecialColumnModel>();
//调用导出方法
ExcelHelper.ExcelDownload(exportTable, excelconfig);
}


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs View File

@@ -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<SpecialColumnModel>();
//调用导出方法
ExcelHelper.ExcelDownload(exportTable, excelconfig);
return Success("导出成功");


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs View File

@@ -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<SpecialColumnModel>();
//调用导出方法
ExcelHelper.ExcelDownload(exportTable, excelconfig);



+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdLessonType/Index.cshtml View File

@@ -2,6 +2,11 @@
ViewBag.Title = "课程类型";
Layout = "~/Views/Shared/_Index.cshtml";
}
<style>
.lr-form-item-title{
width:82px;
}
</style>
<div class="lr-layout ">
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle ">


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs View File

@@ -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<ColumnModel>();
excelconfig.SpecialColumnEntity = new List<SpecialColumnModel>();
//表头
DataTable dt = excelImportIBLL.GetImportError(fileId);
foreach (DataColumn col in dt.Columns)


+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Sal_UserSalaryController.cs View File

@@ -311,6 +311,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
});
dt.Columns.Add(item.STIName, typeof(string));
}

excelConfig.SpecialColumnEntity = new List<SpecialColumnModel>();
ExcelHelper.ExcelDownload(dt, excelConfig);

}


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UtilityController.cs View File

@@ -359,6 +359,7 @@ namespace Learun.Application.Web.Controllers
excelconfig.FileName = Server.UrlDecode(fileName) + ".xls";
excelconfig.IsAllSizeColumn = true;
excelconfig.ColumnEntity = new List<ColumnModel>();
excelconfig.SpecialColumnEntity = new List<SpecialColumnModel>();
//表头
List<jfGridModel> columnList = columnJson.ToList<jfGridModel>();
//行数据


Loading…
Cancel
Save