工资导入的时候增加录入发放时间

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()

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.cshtml

@@ -30,7 +30,7 @@
                         <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_view"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_import" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;导入</a>
+                        <a id="lr_import" class="btn btn-default"><i class="fa fa-share-square-o"></i>&nbsp;导入</a>
                     </div>
                 </div>
             </div>

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)