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

增加调整原因，技能等级变化

This commit is contained in:
钱涛 2025-03-21 11:25:10 +08:00
parent 66250c2ddc
commit 8a8e591ce3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
View File

@ -19,6 +19,7 @@ public enum SalaryArchiveItemAdjustReasonEnum implements BaseEnum<String> {
ONBOARD("ONBOARD", "入职", 85901),
PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984),
SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985),
SKILL_LEVEL_CHANGE("SKILL_LEVEL_CHANGE", "技能等级变化", 85901),
PROMOTION("PROMOTION", "晋升", 85985),
DEMOTION("DEMOTION", "降职", 85985),
JOB_TRANSFER("JOB_TRANSFER", "调岗", 85985),

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

@ -389,7 +389,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
excelComments.add(new ExcelComment(8, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'")));
excelComments.add(new ExcelComment(9, 0, 11, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'")));
} else if (isSalaryItemAdjust) {
excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "必填,可填写如:入职,转正,调薪,晋升,降职,调岗,调岗调薪,离职,其他,初始化")));
excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "必填,可填写如:入职,转正,调薪,技能等级变化,晋升,降职,调岗,调岗调薪,离职,其他,初始化")));
excelComments.add(new ExcelComment(8, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'")));
}
} else if (isSuspendList) {