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

解决人员状态null问题

This commit is contained in:
钱涛 2024-10-28 15:08:10 +08:00
parent a51f20b798
commit 63928ddc59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -719,7 +719,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
MonthTypeEnum monthType = salaryBillViewingLimitSetting.getMonthType();
LocalDate localDate;
if (monthType == MonthTypeEnum.SALARY_DATE) {
localDate = LocalDate.now().plusMonths(-salaryBillViewingLimitSetting.getLimitMonth()+1).withDayOfMonth(1);
localDate = LocalDate.now().plusMonths(-salaryBillViewingLimitSetting.getLimitMonth() + 1).withDayOfMonth(1);
} else {
localDate = LocalDate.now().plusMonths(-salaryBillViewingLimitSetting.getLimitMonth());
}
@ -1110,7 +1110,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
map.put("mobile", e.getMobile());
map.put("dissmissdate", hrmDepartmentComInfo.getDismissdate());
map.put("status", salaryAcctEmployee.getStatus());
map.put("statusName", UserStatusEnum.getDefaultLabelByValue(Integer.valueOf(salaryAcctEmployee.getStatus())));
map.put("statusName", UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(salaryAcctEmployee.getStatus(), 1)));
map.put("workcode", hrmDepartmentComInfo.getWorkcode());
map.put("sex", "0".equals(hrmDepartmentComInfo.getSex()) ? "男" : "女");
map.put("idNo", hrmDepartmentComInfo.getIdNo());