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

新增试用期转正调薪，升职晋升调薪，调岗调薪，降职调薪，特殊调薪

This commit is contained in:
钱涛 2024-12-06 17:46:51 +08:00
parent fc8c2a1391
commit fcaa0e5e8e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,11 @@ import java.util.stream.Collectors;
**/
public enum SalaryArchiveItemAdjustReasonEnum implements BaseEnum<String> {
A("A", "试用期转正调薪", 85901),
B("B", "升职晋升调薪", 85901),
C("C", "调岗调薪", 85901),
D("D", "降职调薪", 85901),
E("E", "特殊调薪", 85901),
ONBOARD("ONBOARD", "入职", 85901),
PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984),
SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985),

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

@ -390,7 +390,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) {