From fcaa0e5e8ef79aa8801122926f6c4bd3b2e3827c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 6 Dec 2024 17:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=95=E7=94=A8=E6=9C=9F?=
 =?UTF-8?q?=E8=BD=AC=E6=AD=A3=E8=B0=83=E8=96=AA=EF=BC=8C=E5=8D=87=E8=81=8C?=
 =?UTF-8?q?=E6=99=8B=E5=8D=87=E8=B0=83=E8=96=AA=EF=BC=8C=E8=B0=83=E5=B2=97?=
 =?UTF-8?q?=E8=B0=83=E8=96=AA=EF=BC=8C=E9=99=8D=E8=81=8C=E8=B0=83=E8=96=AA?=
 =?UTF-8?q?=EF=BC=8C=E7=89=B9=E6=AE=8A=E8=B0=83=E8=96=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryarchive/SalaryArchiveItemAdjustReasonEnum.java     | 5 +++++
 .../salary/service/impl/SalaryArchiveExcelServiceImpl.java   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
index 626635040..900fa17ee 100644
--- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
+++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
@@ -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),
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
index 1ee9bc1d6..69b0c359c 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
@@ -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) {