From 7ad7e9a1b2a6a3c32be4fe916d8cb6f903cbff56 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Wed, 28 Oct 2020 09:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=AF=BC=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=85=A5=E5=8F=91?= =?UTF-8?q?=E6=94=BE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Sal_UserSalaryController.cs | 8 ++++++++ .../PersonnelManagement/Views/Sal_UserSalary/Index.cshtml | 2 +- .../Learun.Application.Excel/Import/ExcelImportBLL.cs | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) 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)