扣缴义务人和账套的人员的人员状态
This commit is contained in:
parent
ad48063ca9
commit
391fa6ebd9
|
|
@ -125,6 +125,7 @@ public class SalarySobRangeBO {
|
|||
.target(salarySobRangePO.getTarget())
|
||||
.targetName(buildTargetName(salarySobRangePO, employeeComInfoMap, departmentComInfoMap, subCompanyComInfoMap, positionComInfoMap))
|
||||
.employeeStatus(employeeStatusesStr)
|
||||
.status(salarySobRangePO.getEmployeeStatuses())
|
||||
.build();
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
|
|
|
|||
|
|
@ -54,4 +54,6 @@ public class SalarySobRangeListDTO {
|
|||
@SalaryTableColumn(text = "员工状态", width = "10%", column = "employeeStatus")
|
||||
@TableTitle(title = "员工状态", dataIndex = "employeeStatus", key = "employeeStatus")
|
||||
private String employeeStatus;
|
||||
|
||||
private String status;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -301,6 +301,7 @@ public class TaxAgentBO {
|
|||
.target(taxAgentManageRange.getTarget())
|
||||
.targetName(buildTargetName(taxAgentManageRange, employeeComInfoMap, departmentComInfoMap, subDepartmentComInfoMap, positionComInfoMap))
|
||||
.employeeStatus(buildEmployeeStatus(hrmStatusNameMap, taxAgentManageRange.getEmployeeStatus()))
|
||||
.status(buildStatus(taxAgentManageRange.getEmployeeStatus()))
|
||||
.build();
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
|
|
@ -316,6 +317,14 @@ public class TaxAgentBO {
|
|||
.collect(Collectors.joining(","));
|
||||
}
|
||||
|
||||
private static String buildStatus( String employeeStatus) {
|
||||
List<String> employeeStatusList = JsonUtil.parseList(employeeStatus, String.class);
|
||||
if (CollectionUtils.isEmpty(employeeStatusList)) {
|
||||
return StringUtils.EMPTY;
|
||||
}
|
||||
return String.join(",", employeeStatusList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建对象名
|
||||
*
|
||||
|
|
|
|||
|
|
@ -59,4 +59,6 @@ public class TaxAgentManageRangeListDTO {
|
|||
)
|
||||
@TableTitle(title ="员工状态",key = "employeeStatus",dataIndex = "employeeStatus")
|
||||
private String employeeStatus;
|
||||
|
||||
private String status;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue