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

Merge branch 'release/2.15.2.2409.01' into feature/权限

This commit is contained in:
钱涛 2024-09-25 16:07:42 +08:00
parent fed88b5ac5 b732430562
commit 2ada09f16c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java
View File

@ -63,9 +63,9 @@ public class SalaryAcctEmployeeBO {
.employeeName(simpleEmployee.getUsername())
.taxAgentId(e.getTaxAgentId())
.taxAgentName(taxAgentNameMap.getOrDefault(e.getTaxAgentId(), StringUtils.EMPTY))
.departmentId(simpleEmployee.getDepartmentId())
.departmentName(simpleEmployee.getDepartmentName())
.status(UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(simpleEmployee.getStatus())))
.departmentId(e.getDepartmentId())
.departmentName(e.getDepartmentName())
.status(UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(e.getStatus())))
.mobile(simpleEmployee.getMobile())
.jobNum(simpleEmployee.getWorkcode())
.hireDate(simpleEmployee.getCompanystartdate())

2
src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
View File

@ -611,7 +611,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
DataCollectionEmployee emp = employeeMap.get(se.getEmployeeId());
resultMap.put("id", se.getId().toString());
resultMap.put("userName", emp == null ? "" : emp.getUsername());
resultMap.put("departmentName", emp == null ? "" : emp.getDepartmentName());
resultMap.put("departmentName", se.getDepartmentName());
resultMap.put("salaryMonth", SalaryDateUtil.getFormatYearMonth(se.getSalaryMonth()));
resultMap.put("taxAgent", taxAgentMap.get(se.getTaxAgentId()));
resultMap.put("salarySob", SalarySobMap.get(se.getSalarySobId()));

3
src/com/engine/salary/sys/enums/OrderRuleEnum.java
View File

@ -18,7 +18,8 @@ public enum OrderRuleEnum implements BaseEnum<String> {
LASTNAME("e.lastName", "人员名称", 1),
DEPTNAME("d.departmentname", "部门名称", 1),
SUBCOMNAME("c.subcompanyname", "分部名称", 1),
SHOWORDEROFDEPTTREE("d.showOrderOfTree", "组织", 1);
SHOWORDEROFDEPTTREE("d.showOrderOfTree", "组织", 1),
WORKCODE("e.workcode", "工号", 1);
private String value;