工资计算 5.12

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -430,13 +430,14 @@ namespace OASystem.API.Controllers
             //designer.Workbook = new Workbook(tepUrl);
             designer.Workbook = new Workbook(AppSettingsHelper.Get("ExcelBasePath") + "Template/工资详细清单.xlsx");
 
+            designer.SetDataSource("WageSheet", wageSheetList);
             designer.SetDataSource("YearMonth", yearMonth);
             designer.SetDataSource("StartEndDt", wageSheetList[0].StartDate +" - "+ wageSheetList[0].EndDate);
             designer.SetDataSource("WorkDays", wageSheetList[0].WorkDays);
             designer.SetDataSource("SumPrice", SumPrice);
 
             designer.Process();
-            string fileName = "WageCard/" + HttpUtility.UrlEncode(yearMonth + "工资单") + "_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx";
+            string fileName = "WageCard/"+ yearMonth + "_" + HttpUtility.UrlEncode("工资单") + "_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx";
             string path = AppSettingsHelper.Get("ExcelBasePath");
             designer.Workbook.Save(path + fileName);
             designer = null;
@@ -446,8 +447,6 @@ namespace OASystem.API.Controllers
 
             string fileUrl = url + excelPath;
 
-
-
             sw.Stop();
             return Ok(JsonView(true, "操作成功!耗时：" + (sw.ElapsedMilliseconds / 1000) + "s", new { FileUrl = fileUrl }));