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 b6df361d8..e03d43a2f 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
@@ -292,6 +292,14 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
Background = new Color()
});
dt.Columns.Add("姓名", typeof(string));
+ excelConfig.ColumnEntity.Add(new ColumnModel()
+ {
+ Column = "发放时间",
+ ExcelColumn = "发放时间",
+ Alignment = "center",
+ Background = new Color()
+ });
+ dt.Columns.Add("发放时间", typeof(string));
foreach (var item in itemList)
{
excelConfig.ColumnEntity.Add(new ColumnModel()
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.cshtml
index bb14df0c5..0004b57d3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.cshtml
@@ -30,7 +30,7 @@
编辑
查看
删除
- 导入
+ 导入
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs
index df3e70990..1be541e3f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs
@@ -719,7 +719,7 @@ namespace Learun.Application.Excel
Sal_UserSalaryEntity sal_UserSalaryEntity = new Sal_UserSalaryEntity();
sal_UserSalaryEntity.Create();
sal_UserSalaryEntity.F_UserId = userIBLL.GetEntityByName(dr["姓名"].ToString())?.F_UserId;
- sal_UserSalaryEntity.USDate = DateTime.Now;
+ sal_UserSalaryEntity.USDate = Convert.ToDateTime(dr["发放时间"].ToString());
stall = 0;//重置应发合计
stactual = 0;//重置实发合计
foreach (var templateItem in templateItemList)