qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/addSpecialDeduction' into release/2.5.3.2301.01

This commit is contained in:
fcli 2023-01-06 09:06:20 +08:00
parent 4a0a18bb07 3863a10c27
commit d700d7a300
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
View File

@ -675,8 +675,13 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
//获取上月员工数据，用于累加
LocalDateTime lastMonthDateTime = yearMonthTime.minusMonths(1);
YearMonth lastMonth = YearMonth.of(lastMonthDateTime.getYear(), lastMonthDateTime.getMonth());
Map<Long, List<AddUpDeduction>> lastEmpInfo = getEmpInfoByYearMonth(taxAgent, employeePOs, lastMonth);
Map<Long, List<AddUpDeduction>> lastEmpInfo;
if (lastMonthDateTime.getYear() == yearMonthTime.getYear()) {
YearMonth lastMonth = YearMonth.of(lastMonthDateTime.getYear(), lastMonthDateTime.getMonth());
lastEmpInfo = getEmpInfoByYearMonth(taxAgent, employeePOs, lastMonth);
} else {
lastEmpInfo = new HashMap<>(0);
}
//获取当月员工数据，用于更新
YearMonth currentMonth = YearMonth.of(yearMonthTime.getYear(), yearMonthTime.getMonth());