|
|
@@ -243,7 +243,6 @@ namespace OASystem.API.Controllers
|
|
|
string preYearMonth = yearMonthDt.AddMonths(-1).ToString("yyyy-MM");
|
|
|
|
|
|
|
|
|
- Result hoildays = await PayrollComputation.GetWorkDays(startDt, endDt);
|
|
|
|
|
|
//计算本月工资起止时间 比如是2月的1号-28号，那就是2月1号的零点到3月1号的零点
|
|
|
DateTime thisStartDt = startDt;
|
|
|
@@ -274,7 +273,7 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
List<Pm_WageSheet> wageSheets = new List<Pm_WageSheet>();
|
|
|
|
|
|
- _result = await PayrollComputation.SalaryCalculatorAsync(preWageSheetItems1, userNames,dto.UserId, thisYearMonth, thisStartDt, );
|
|
|
+ _result = await PayrollComputation.SalaryCalculatorAsync(preWageSheetItems1, userNames,dto.UserId, thisYearMonth, thisStartDt,thisEndDt);
|
|
|
|
|
|
#region 批量添加
|
|
|
|
