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

核算记录组织字段分开标识

This commit is contained in:
钱涛 2024-10-22 16:38:27 +08:00
parent ce8356f9b2
commit b5e6059298
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
View File

@ -296,6 +296,8 @@ public class SalaryAcctResultBO {
map.put("departmentId", e.getDepartmentId());
} else if ("subcompanyName".equals(salarySobEmpField.getFieldCode())) {
map.put("subcompanyName", e.getSubcompanyName());
}else if ("subcompanyId".equals(salarySobEmpField.getFieldCode())) {
map.put("subcompanyId", e.getSubcompanyId());
} else if ("jobcall".equals(salarySobEmpField.getFieldCode())) {
map.put("jobcall", e.getJobcall());
} else if ("jobcallId".equals(salarySobEmpField.getFieldCode())) {

9
src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
View File

@ -119,29 +119,38 @@ public class SalaryAcctEmployeePO {
* 分部
*/
@I18n
@SalaryFormulaVar(defaultLabel = "分部", labelId = 86321, dataType = "string")
private String subcompanyName;
@SalaryFormulaVar(defaultLabel = "分部ID", labelId = 86321, dataType = "string")
private Long subcompanyId;
/**
* 部门
*/
@I18n
@SalaryFormulaVar(defaultLabel = "部门", labelId = 86321, dataType = "string")
private String departmentName;
@SalaryFormulaVar(defaultLabel = "部门ID", labelId = 86321, dataType = "string")
private Long departmentId;
/**
* 岗位
*/
@I18n
@SalaryFormulaVar(defaultLabel = "岗位", labelId = 86321, dataType = "string")
private String jobtitleName;
@SalaryFormulaVar(defaultLabel = "岗位ID", labelId = 86321, dataType = "string")
private Long jobtitleId;
/**
* 职称
*/
@I18n
@SalaryFormulaVar(defaultLabel = "职称", labelId = 86321, dataType = "string")
private String jobcall;
@SalaryFormulaVar(defaultLabel = "职称ID", labelId = 86321, dataType = "string")
private Long jobcallId;
/**
* 状态
*/
@SalaryFormulaVar(defaultLabel = "状态", labelId = 86321, dataType = "string")
private String status;
//锁定的项目