计算工资 5.13

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -426,8 +426,7 @@ namespace OASystem.API.Controllers
             }
 
             WorkbookDesigner designer = new WorkbookDesigner();
-            //string tepUrl = string.Format("http://132.232.92.186:24/Server/File/OA2023/Office/Excel/Template/工资详细清单.xlsx");
-            //designer.Workbook = new Workbook(tepUrl);
+
             designer.Workbook = new Workbook(AppSettingsHelper.Get("ExcelBasePath") + "Template/工资详细清单.xlsx");
 
             designer.SetDataSource("WageSheet", wageSheetList);
@@ -435,22 +434,20 @@ namespace OASystem.API.Controllers
             designer.SetDataSource("StartEndDt", wageSheetList[0].StartDate +" - "+ wageSheetList[0].EndDate);
             designer.SetDataSource("WorkDays", wageSheetList[0].WorkDays);
             designer.SetDataSource("SumPrice", SumPrice);
-
+            designer.SetDataSource("WageSheetTitle", "工资单");//
             designer.Process();
-            string fileName = "WageCard/"+ yearMonth + "_" + HttpUtility.UrlEncode("工资单") + "_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx";
+
+            string fileName = "WageCard/" + yearMonth + "_工资单_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx";
             string path = AppSettingsHelper.Get("ExcelBasePath");
             designer.Workbook.Save(path + fileName);
             designer = null;
 
             string excelPath = AppSettingsHelper.Get("ExcelFtpPath") + fileName;
             string url = AppSettingsHelper.Get("ExcelBaseUrl");
-
             string fileUrl = url + excelPath;
 
             sw.Stop();
             return Ok(JsonView(true, "操作成功!耗时：" + (sw.ElapsedMilliseconds / 1000) + "s", new { FileUrl = fileUrl }));
-
-
         }
 
         #endregion

OASystem/OASystem.Domain/ViewModels/PersonnelModule/WageSheetView.cs

@@ -381,11 +381,6 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
             }
         }
 
-        /// <summary>
-        /// 税后工资
-        /// </summary>
-        public decimal AfterTax { get; set; }
-
         /// <summary>
         /// 最后操作人
         /// </summary>