From 026ef5c0e611907d23cefc4dc0e3be08b22c6c74 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 5 May 2023 17:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=AD=E6=96=87=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?0505?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 2 +- .../cmd/sicategory/SICategoryGetFormCmd.java | 2 +- .../datacollection/DataCollectionEmployee.java | 2 +- .../salaryarchive/bo/SalaryArchiveBO.java | 2 +- .../dto/SalaryFormulaEmployeeDTO.java | 2 +- .../salary/enums/SalaryDataSourceEnum.java | 4 ++-- .../engine/salary/enums/SalaryItemTypeEnum.java | 2 +- .../engine/salary/enums/SalaryOnOffEnum.java | 5 +++-- .../salary/enums/SalaryValueTypeEnum.java | 2 +- src/com/engine/salary/enums/UserStatusEnum.java | 17 +++++++++-------- .../AttendQuoteFieldTypeEnum.java | 6 ++++-- .../AttendQuoteSourceTypeEnum.java | 6 ++++-- .../salaryaccounting/EmployeeTypeEnum.java | 5 +++-- .../enums/salaryaccounting/LockStatusEnum.java | 7 ++++--- .../SalaryAcctRecordStatusEnum.java | 7 ++++--- .../enums/salaryarchive/ArchiveStatusEnum.java | 5 +++-- ...IndividualTaxWithholdingAgentStatusEnum.java | 8 +++++--- .../salaryarchive/SalaryArchiveAddTypeEnum.java | 8 +++++--- .../SalaryArchiveDimissionTimeIntervalEnum.java | 16 +++++++++------- .../SalaryArchiveFieldTypeEnum.java | 4 ++-- .../SalaryArchiveImportTypeEnum.java | 7 ++++--- .../SalaryArchiveItemAdjustReasonEnum.java | 12 ++++++------ .../SalaryArchiveListTypeEnum.java | 9 +++++---- .../salaryarchive/SalaryArchiveStatusEnum.java | 12 +++++++----- .../SalaryArchiveTaxAgentAdjustReasonEnum.java | 10 +++++----- .../enums/salarybill/SalarySendStatusEnum.java | 4 ++-- .../SalaryTemplateReplenishRuleEnum.java | 6 ++++-- .../SalaryTemplateTextContentPositionEnum.java | 6 ++++-- .../enums/salarybill/SalaryTemplateVarEnum.java | 2 +- .../salarybill/SalaryTemplateWhetherEnum.java | 6 ++++-- .../salaryformula/FormulaVarFieldTypeEnum.java | 6 ++++-- .../enums/salaryformula/ReferenceTypeEnum.java | 2 +- .../enums/salaryformula/ReturnTypeEnum.java | 6 ++++-- .../SalaryFormulaReferenceEnum.java | 8 ++++---- .../salaryformula/SalarySQLReferenceEnum.java | 7 ++++--- .../enums/salaryformula/ValidateTypeEnum.java | 6 ++++-- .../enums/salaryitem/SalaryDataTypeEnum.java | 5 +++-- .../salarysend/SalarySendGrantTypeEnum.java | 5 +++-- .../SalarySendRangeTargetTypeEnum.java | 6 +++--- .../salarysend/SalarySendRangeTypeEnum.java | 2 +- .../enums/salarysob/IncomeCategoryEnum.java | 7 ++++--- .../salarysob/SalaryEmployeeStatusEnum.java | 17 +++++++++-------- .../salarysob/SalarySobAdjustRuleTypeEnum.java | 9 +++++---- .../salary/enums/salarysob/TargetTypeEnum.java | 8 ++++---- .../salary/enums/siaccount/BillStatusEnum.java | 5 +++-- .../enums/siaccount/EmployeeStatusEnum.java | 11 ++++++----- .../enums/siaccount/PaymentStatusEnum.java | 2 +- .../salary/enums/siaccount/ProjectTypeEnum.java | 4 ++-- .../enums/siaccount/ResourceFromEnum.java | 7 ++++--- .../salary/enums/sicategory/DataTypeEnum.java | 2 +- .../salary/enums/sicategory/DeleteTypeEnum.java | 6 ++++-- .../enums/sicategory/IncludeTypeEnum.java | 6 ++++-- .../salary/enums/sicategory/IsPaymentEnum.java | 6 ++++-- .../salary/enums/sicategory/IsUseEnum.java | 6 ++++-- .../salary/enums/sicategory/NonPaymentEnum.java | 2 +- .../service/impl/AttendQuoteServiceImpl.java | 2 +- 56 files changed, 194 insertions(+), 145 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 7d1dae88a..5aeda5142 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1380,7 +1380,7 @@ public class SIArchivesBiz { subcompanyIds.setFieldcol(16); subcompanyIds.setLabelcol(8); subcompanyIds.setIsQuickSearch(true); - subcompanyIds.setLabel("分部"); + subcompanyIds.setLabel(SalaryI18nUtil.getI18nLabel(33553,"分部")); conditionItems.add(subcompanyIds); // SearchConditionItem hireDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{"hireDate", "hireDate"}); diff --git a/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java b/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java index 2fae2321e..b10055741 100644 --- a/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java +++ b/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java @@ -56,7 +56,7 @@ public class SICategoryGetFormCmd extends AbstractCommonCommand radioOptions = new ArrayList <>(); radioOptions.add(new SearchConditionOption("SOCIAL_SECURITY",SalaryI18nUtil.getI18nLabel(538967, "社保"),true)); radioOptions.add(new SearchConditionOption("ACCUMULATION_FUND",SalaryI18nUtil.getI18nLabel(538969, "公积金"))); - radioOptions.add(new SearchConditionOption("OTHER","企业年金及其他福利")); + radioOptions.add(new SearchConditionOption("OTHER",SalaryI18nUtil.getI18nLabel(542717, "企业年金及其他福利"))); radio.setColSpan(2); radio.setFieldcol(12); radio.setLabelcol(6); diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java index 814d4d96a..1f06d5dca 100644 --- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java +++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java @@ -40,7 +40,7 @@ public class DataCollectionEmployee { private Long departmentId; //分部名 - @SalaryFormulaVar(defaultLabel = "分部", labelId = 82465, dataType = "string") + @SalaryFormulaVar(defaultLabel = "分部", labelId = 33553, dataType = "string") private String subcompanyName; private Long subcompanyid; diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java index d64cc52fc..2d41121b5 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java @@ -77,7 +77,7 @@ public class SalaryArchiveBO { columns.add(employeeIdColumn); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(25034,"姓名"), "username")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"), "taxAgentName")); - columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "分部"), "subcompanyName")); + columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(33553, "分部"), "subcompanyName")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "workcode")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(125238, "手机号"), "mobile")); diff --git a/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java b/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java index afc8e5371..3e034da17 100644 --- a/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java +++ b/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java @@ -38,7 +38,7 @@ public class SalaryFormulaEmployeeDTO { //分部 - @SalaryFormulaVar(defaultLabel = "分部", labelId = 82465, dataType = "string") + @SalaryFormulaVar(defaultLabel = "分部", labelId = 33553, dataType = "string") private String subcompanyName; diff --git a/src/com/engine/salary/enums/SalaryDataSourceEnum.java b/src/com/engine/salary/enums/SalaryDataSourceEnum.java index cfdb8bbbf..7f3587309 100644 --- a/src/com/engine/salary/enums/SalaryDataSourceEnum.java +++ b/src/com/engine/salary/enums/SalaryDataSourceEnum.java @@ -18,11 +18,11 @@ public enum SalaryDataSourceEnum implements BaseEnum { INPUT_IMPORT(0, SalaryI18nUtil.getI18nLabel(542339, "输入/导入"), 542339), CUSTOM_FORMULA(1, "自定义公式", 92001), SALARY_ITEM(2, SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), 542362), - EMPLOYEE_INFO(3, "员工基本信息", 85366), + EMPLOYEE_INFO(3, SalaryI18nUtil.getI18nLabel(542699, "员工基本信息"), 542699), SALARY_ARCHIVES(4, SalaryI18nUtil.getI18nLabel(538004, "薪资档案"), 538004), CUMULATIVE_SITUATION(5, "累计情况（工资、薪金）", 87521), SPE_ADDI_DEDUCTIONS(6, SalaryI18nUtil.getI18nLabel(538006, "累计专项附加扣除"), 538006), - SOCIAL_SECURITY(7, "社保福利", 87522), + SOCIAL_SECURITY(7, SalaryI18nUtil.getI18nLabel(537999, "社保福利"), 537999), OTHER_DEDUCTION(8, "其他扣除", 85831), ; diff --git a/src/com/engine/salary/enums/SalaryItemTypeEnum.java b/src/com/engine/salary/enums/SalaryItemTypeEnum.java index 3f5aff7dd..afce03ce4 100644 --- a/src/com/engine/salary/enums/SalaryItemTypeEnum.java +++ b/src/com/engine/salary/enums/SalaryItemTypeEnum.java @@ -30,7 +30,7 @@ public enum SalaryItemTypeEnum implements BaseEnum { AFTER_TAX_ADJUSTMENT(14, SalaryItemCategoryEnum.AFTER_TAX_ADD, "税后调整", 85833), AFTER_TAX_DEDUCTION(15, SalaryItemCategoryEnum.AFTER_TAX_DUD, "税后扣款", 85834), TAX(16, SalaryItemCategoryEnum.TAX, "税费", 85835), - EMPLOYEE_INFO(18, SalaryItemCategoryEnum.OTHER, "员工基本信息", 85366), + EMPLOYEE_INFO(18, SalaryItemCategoryEnum.OTHER, SalaryI18nUtil.getI18nLabel(542699, "员工基本信息"), 542699), ATTEND_INFO(20, SalaryItemCategoryEnum.OTHER, "员工考勤信息", 98890), OTHER(19, SalaryItemCategoryEnum.OTHER, "其他数值", 100114), TEXT(17, SalaryItemCategoryEnum.OTHER, "其他文本", 100115), diff --git a/src/com/engine/salary/enums/SalaryOnOffEnum.java b/src/com/engine/salary/enums/SalaryOnOffEnum.java index 7afb5aab0..da9a20bed 100644 --- a/src/com/engine/salary/enums/SalaryOnOffEnum.java +++ b/src/com/engine/salary/enums/SalaryOnOffEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums; +import com.engine.salary.util.SalaryI18nUtil; /** * @description: 是、否 @@ -11,8 +12,8 @@ package com.engine.salary.enums; */ public enum SalaryOnOffEnum implements BaseEnum { - ON(1, "是", 84967), - OFF(0, "否", 84968); + ON(1, SalaryI18nUtil.getI18nLabel(538048, "是"), 538048), + OFF(0, SalaryI18nUtil.getI18nLabel(30587, "否"), 30587); private int value; diff --git a/src/com/engine/salary/enums/SalaryValueTypeEnum.java b/src/com/engine/salary/enums/SalaryValueTypeEnum.java index 07e583af4..7fa921db7 100644 --- a/src/com/engine/salary/enums/SalaryValueTypeEnum.java +++ b/src/com/engine/salary/enums/SalaryValueTypeEnum.java @@ -17,7 +17,7 @@ import java.util.Objects; public enum SalaryValueTypeEnum implements BaseEnum { INPUT(1, SalaryI18nUtil.getI18nLabel(554, "输入"), 554), - FORMULA(2, "公式", 84977), + FORMULA(2, SalaryI18nUtil.getI18nLabel(18125, "公式"), 18125), SQL(3, "SQL", 84977); private int value; diff --git a/src/com/engine/salary/enums/UserStatusEnum.java b/src/com/engine/salary/enums/UserStatusEnum.java index bd4cc6670..7e7e03ca8 100644 --- a/src/com/engine/salary/enums/UserStatusEnum.java +++ b/src/com/engine/salary/enums/UserStatusEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums; import com.engine.salary.entity.hrm.HrmStatus; +import com.engine.salary.util.SalaryI18nUtil; import java.util.*; import java.util.stream.Collectors; @@ -15,14 +16,14 @@ import java.util.stream.Collectors; **/ public enum UserStatusEnum implements BaseEnum { - TRIAL(0, "试用", 1), - FORMAL(1, "正式", 1), - TEMPORARY(2, "临时", 1), - DELAY(3, "试用延期", 1), - FIRE(4, "解雇", 1), - DEPARTURE(5, "离职", 1), - RETIRED(6, "退休", 1), - INVALID(7, "无效", 1); + TRIAL(0, SalaryI18nUtil.getI18nLabel(18883, "试用"), 18883), + FORMAL(1, SalaryI18nUtil.getI18nLabel(15711, "正式"), 15711), + TEMPORARY(2, SalaryI18nUtil.getI18nLabel(480, "临时"), 480), + DELAY(3, SalaryI18nUtil.getI18nLabel(15844, "试用延期"), 15844), + FIRE(4, SalaryI18nUtil.getI18nLabel(542707, "解雇"), 542707), + DEPARTURE(5, SalaryI18nUtil.getI18nLabel(6091, "离职"), 6091), + RETIRED(6, SalaryI18nUtil.getI18nLabel(6092, "退休"), 6092), + INVALID(7, SalaryI18nUtil.getI18nLabel(6091, "无效"), 1); private Integer value; private String defaultLabel; diff --git a/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java b/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java index 166d0d49a..ec36a1204 100644 --- a/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java +++ b/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.datacollection; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; /** @@ -8,8 +10,8 @@ import java.util.Arrays; * @Date: 2021-11-17 14:37 */ public enum AttendQuoteFieldTypeEnum { - NUMBER(1, "数值", 87625), - TEXT(2, "文本", 85393); + NUMBER(1, SalaryI18nUtil.getI18nLabel(17639, "数值"), 17639), + TEXT(2, SalaryI18nUtil.getI18nLabel(128895, "文本"), 128895); private int value; diff --git a/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java b/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java index c9072d4fa..b8009d84a 100644 --- a/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java +++ b/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.datacollection; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; /** @@ -8,8 +10,8 @@ import java.util.Arrays; * @Date: 2021-11-17 14:37 */ public enum AttendQuoteSourceTypeEnum { - QUOTE(1, "引用", 87621), - IMPORT(2, "导入", 87622); + QUOTE(1, SalaryI18nUtil.getI18nLabel(19422, "引用"), 19422), + IMPORT(2, SalaryI18nUtil.getI18nLabel(32935, "导入"), 32935); private int value; diff --git a/src/com/engine/salary/enums/salaryaccounting/EmployeeTypeEnum.java b/src/com/engine/salary/enums/salaryaccounting/EmployeeTypeEnum.java index c110eba77..364001e32 100644 --- a/src/com/engine/salary/enums/salaryaccounting/EmployeeTypeEnum.java +++ b/src/com/engine/salary/enums/salaryaccounting/EmployeeTypeEnum.java @@ -1,14 +1,15 @@ package com.engine.salary.enums.salaryaccounting; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; /** * 人员类型 */ public enum EmployeeTypeEnum implements BaseEnum { - ORGANIZATION(0, "组织架构", 109125), - EXT_EMPLOYEE(1, "非系统人员", 119127), + ORGANIZATION(0, SalaryI18nUtil.getI18nLabel(131255, "组织架构"), 131255), + EXT_EMPLOYEE(1, SalaryI18nUtil.getI18nLabel(542679, "非系统人员"), 542679), ; private int value; diff --git a/src/com/engine/salary/enums/salaryaccounting/LockStatusEnum.java b/src/com/engine/salary/enums/salaryaccounting/LockStatusEnum.java index 316f9aa91..7592fe02f 100644 --- a/src/com/engine/salary/enums/salaryaccounting/LockStatusEnum.java +++ b/src/com/engine/salary/enums/salaryaccounting/LockStatusEnum.java @@ -1,12 +1,13 @@ package com.engine.salary.enums.salaryaccounting; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; public enum LockStatusEnum implements BaseEnum { - DEFAULT("DEFAULT", "默认", 0), - LOCK("LOCK", "锁定", 0), - UNLOCK("UNLOCK", "未锁定", 0); + DEFAULT("DEFAULT", SalaryI18nUtil.getI18nLabel(149, "默认"), 149), + LOCK("LOCK", SalaryI18nUtil.getI18nLabel(16213, "锁定"), 16213), + UNLOCK("UNLOCK", SalaryI18nUtil.getI18nLabel(383090, "未锁定"), 383090); private String value; diff --git a/src/com/engine/salary/enums/salaryaccounting/SalaryAcctRecordStatusEnum.java b/src/com/engine/salary/enums/salaryaccounting/SalaryAcctRecordStatusEnum.java index c8e56cb1d..0000d82ae 100644 --- a/src/com/engine/salary/enums/salaryaccounting/SalaryAcctRecordStatusEnum.java +++ b/src/com/engine/salary/enums/salaryaccounting/SalaryAcctRecordStatusEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.salaryaccounting; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; import java.util.Objects; @@ -14,9 +15,9 @@ import java.util.Objects; **/ public enum SalaryAcctRecordStatusEnum implements BaseEnum { - NOT_ARCHIVED(1, "未归档", 91870), - ARCHIVED(2, "已归档", 91862), - DECLARED(3, "已申报", 100119), + NOT_ARCHIVED(1, SalaryI18nUtil.getI18nLabel(17999, "未归档"), 17999), + ARCHIVED(2, SalaryI18nUtil.getI18nLabel(18800, "已归档"), 18800), + DECLARED(3, SalaryI18nUtil.getI18nLabel(504408, "已申报"), 504408), ; private int value; diff --git a/src/com/engine/salary/enums/salaryarchive/ArchiveStatusEnum.java b/src/com/engine/salary/enums/salaryarchive/ArchiveStatusEnum.java index b927d3eb6..b03dab65e 100644 --- a/src/com/engine/salary/enums/salaryarchive/ArchiveStatusEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/ArchiveStatusEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.salaryarchive; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; /** * 薪资档案-状态 @@ -12,8 +13,8 @@ import com.engine.salary.enums.BaseEnum; **/ public enum ArchiveStatusEnum implements BaseEnum { - EFFICIENT("EFFICIENT", "有效", 93335), - ARCHIVE("ARCHIVE", "封存", 93336); + EFFICIENT("EFFICIENT", SalaryI18nUtil.getI18nLabel(2246, "有效"), 2246), + ARCHIVE("ARCHIVE", SalaryI18nUtil.getI18nLabel(501335, "封存"), 501335); private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java b/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java index 76410323f..16abb7487 100644 --- a/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java @@ -1,13 +1,15 @@ package com.engine.salary.enums.salaryarchive; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; public enum IndividualTaxWithholdingAgentStatusEnum { - UN_VALIDATE(0, "未校验", 85255), - VALIDATE_SUCCESS(1, "校验成功", 85256), - VALIDATE_FAIL(2, "校验失败", 85257); + UN_VALIDATE(0, SalaryI18nUtil.getI18nLabel(534727, "未校验"), 534727), + VALIDATE_SUCCESS(1, SalaryI18nUtil.getI18nLabel(542680, "校验成功"), 542680), + VALIDATE_FAIL(2, SalaryI18nUtil.getI18nLabel(542681, "校验失败"), 542681); private int value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java index 0983e7b9c..d2e620c08 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java @@ -1,6 +1,8 @@ package com.engine.salary.enums.salaryarchive; +import com.engine.salary.util.SalaryI18nUtil; + /** * 薪资档案-定薪类型 *

Copyright: Copyright (c) 2022

@@ -11,9 +13,9 @@ package com.engine.salary.enums.salaryarchive; **/ public enum SalaryArchiveAddTypeEnum { - INDUCTION(0, "入职", 85901), - REHIRE(2, "返聘", 109535), - TAXAGENTADJUST(1, "调整个税扣缴义务人", 93910); + INDUCTION(0, SalaryI18nUtil.getI18nLabel(16250, "入职"), 16250), + REHIRE(2, SalaryI18nUtil.getI18nLabel(15884, "返聘"), 15884), + TAXAGENTADJUST(1, SalaryI18nUtil.getI18nLabel(542682, "调整个税扣缴义务人"), 542682); private int value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveDimissionTimeIntervalEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveDimissionTimeIntervalEnum.java index 54ae7860d..4db2d3076 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveDimissionTimeIntervalEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveDimissionTimeIntervalEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.salaryarchive; +import com.engine.salary.util.SalaryI18nUtil; + /** * @Description: 已离职时段 * @Author: wangxiangzhong @@ -7,13 +9,13 @@ package com.engine.salary.enums.salaryarchive; */ public enum SalaryArchiveDimissionTimeIntervalEnum { - HALFMONTH("HALFMONTH", "半个月", 93335), - ONEMONTH("ONEMONTH", "一个月", 93336), - TWOMONTH("TWOMONTH", "两个月", 93337), - THREEMONTH("THREEMONTH", "三个月", 93338), - FOURMONTH("FOURMONTH", "四个月", 93339), - FIVEMONTH("FIVEMONTH", "五个月", 93340), - HALFYEAR("HALFYEAR", "半年", 93341); + HALFMONTH("HALFMONTH", SalaryI18nUtil.getI18nLabel(542683, "半个月"), 542683), + ONEMONTH("ONEMONTH", SalaryI18nUtil.getI18nLabel(24490, "一个月"), 24490), + TWOMONTH("TWOMONTH", SalaryI18nUtil.getI18nLabel(517270, "两个月"), 517270), + THREEMONTH("THREEMONTH", SalaryI18nUtil.getI18nLabel(24491, "三个月"), 24491), + FOURMONTH("FOURMONTH", SalaryI18nUtil.getI18nLabel(542684, "四个月"), 542684), + FIVEMONTH("FIVEMONTH", SalaryI18nUtil.getI18nLabel(542685, "五个月"), 542685), + HALFYEAR("HALFYEAR", SalaryI18nUtil.getI18nLabel(534496, "半年"), 534496); private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java index 6ef302e20..9df090d39 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java @@ -15,8 +15,8 @@ import java.util.Optional; * @version 1.0 **/ public enum SalaryArchiveFieldTypeEnum implements BaseEnum { - NUMBER("number", "数值", 87625), - STRING("string", "字符", 105093), + NUMBER("number", SalaryI18nUtil.getI18nLabel(17639, "数值"), 17639), + STRING("string", SalaryI18nUtil.getI18nLabel(391259, "字符"), 391259), ; private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveImportTypeEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveImportTypeEnum.java index aa2d2a838..665b82abd 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveImportTypeEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveImportTypeEnum.java @@ -1,5 +1,6 @@ package com.engine.salary.enums.salaryarchive; +import com.engine.salary.util.SalaryI18nUtil; import org.apache.commons.lang3.StringUtils; /** @@ -12,9 +13,9 @@ import org.apache.commons.lang3.StringUtils; **/ public enum SalaryArchiveImportTypeEnum { - SALARYITEMADJUST("salaryItemAdjust", "调薪", 85985), - TAXAGENTADJUST("taxAgentAdjust", "调整个税扣缴义务人", 93910), - INIT("init", "档案初始化", 101600); + SALARYITEMADJUST("salaryItemAdjust", SalaryI18nUtil.getI18nLabel(542686, "调薪"), 542686), + TAXAGENTADJUST("taxAgentAdjust", SalaryI18nUtil.getI18nLabel(542682, "调整个税扣缴义务人"), 542682), + INIT("init", SalaryI18nUtil.getI18nLabel(542687, "档案初始化"), 542687); private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java index 9ed6c80f7..bc239633a 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java @@ -15,13 +15,13 @@ import java.util.stream.Collectors; **/ public enum SalaryArchiveItemAdjustReasonEnum { - ONBOARD("ONBOARD", "入职", 85901), - PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984), - SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985), - POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", "调岗调薪", 85986), - DIMISSION("DIMISSION", "离职", 85902), + ONBOARD("ONBOARD", SalaryI18nUtil.getI18nLabel(16250, "入职"), 16250), + PROBATION_REVIEW("PROBATION_REVIEW", SalaryI18nUtil.getI18nLabel(6088, "转正"), 6088), + SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", SalaryI18nUtil.getI18nLabel(542686, "调薪"), 542686), + POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", SalaryI18nUtil.getI18nLabel(542688, "调岗调薪"), 542688), + DIMISSION("DIMISSION", SalaryI18nUtil.getI18nLabel(6091, "离职"), 6091), OTHER("OTHER", SalaryI18nUtil.getI18nLabel(25740, "其他"), 25740), - INIT("INIT", "初始化", 85903); + INIT("INIT", SalaryI18nUtil.getI18nLabel(20873, "初始化"), 20873); private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveListTypeEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveListTypeEnum.java index 2b04a2336..f0827ea58 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveListTypeEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveListTypeEnum.java @@ -1,5 +1,6 @@ package com.engine.salary.enums.salaryarchive; +import com.engine.salary.util.SalaryI18nUtil; import org.apache.commons.lang3.StringUtils; /** @@ -12,10 +13,10 @@ import org.apache.commons.lang3.StringUtils; **/ public enum SalaryArchiveListTypeEnum { - PENDING("PENDING", "待定薪", 107875), - FIXED("FIXED", "发薪", 109713), - SUSPEND("SUSPEND", "待停薪", 107879), - STOP("STOP", "停薪", 109348); + PENDING("PENDING", SalaryI18nUtil.getI18nLabel(542689, "待定薪"), 542689), + FIXED("FIXED", SalaryI18nUtil.getI18nLabel(542690, "发薪"), 542690), + SUSPEND("SUSPEND", SalaryI18nUtil.getI18nLabel(542691, "待停薪"), 542691), + STOP("STOP", SalaryI18nUtil.getI18nLabel(542692, "停薪"), 542692); private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveStatusEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveStatusEnum.java index 83b97f6c1..d94772ab3 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveStatusEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveStatusEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.salaryarchive; +import com.engine.salary.util.SalaryI18nUtil; + /** * 薪资档案状态 *

Copyright: Copyright (c) 2022

@@ -10,11 +12,11 @@ package com.engine.salary.enums.salaryarchive; **/ public enum SalaryArchiveStatusEnum { - PENDING("PENDING", "待定薪"), - FIXED("FIXED", "发薪"), - SUSPEND("SUSPEND", "待停薪"), - STOP_FROM_PENDING("STOP_FROM_PENDING", "停薪_来自待定薪"), - STOP_FROM_SUSPEND("STOP_FROM_SUSPEND", "停薪_来自待停薪"); + PENDING("PENDING", SalaryI18nUtil.getI18nLabel(542689, "待定薪")), + FIXED("FIXED", SalaryI18nUtil.getI18nLabel(542690, "发薪")), + SUSPEND("SUSPEND", SalaryI18nUtil.getI18nLabel(542691, "待停薪")), + STOP_FROM_PENDING("STOP_FROM_PENDING", SalaryI18nUtil.getI18nLabel(542693, "停薪_来自待定薪")), + STOP_FROM_SUSPEND("STOP_FROM_SUSPEND", SalaryI18nUtil.getI18nLabel(542694, "停薪_来自待停薪")); private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java index fe3f37842..c585fc557 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java @@ -15,12 +15,12 @@ import java.util.stream.Collectors; **/ public enum SalaryArchiveTaxAgentAdjustReasonEnum { - ADJUSTMENT("ADJUSTMENT", "调动", 85899), - CHANGE("CHANGE", "变更", 85900), - ONBOARD("ONBOARD", "入职", 85901), - DIMISSION("DIMISSION", "离职", 85902), + ADJUSTMENT("ADJUSTMENT", SalaryI18nUtil.getI18nLabel(6090, "调动"), 6090), + CHANGE("CHANGE", SalaryI18nUtil.getI18nLabel(19899, "变更"), 19899), + ONBOARD("ONBOARD", SalaryI18nUtil.getI18nLabel(16250, "入职"), 16250), + DIMISSION("DIMISSION", SalaryI18nUtil.getI18nLabel(6091, "离职"), 6091), OTHER("OTHER", SalaryI18nUtil.getI18nLabel(25740, "其他"), 25740), - INIT("INIT", "初始化", 85903); + INIT("INIT", SalaryI18nUtil.getI18nLabel(20873, "初始化"), 20873); private String value; diff --git a/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java b/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java index c8f1245e5..262f9102c 100644 --- a/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java +++ b/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java @@ -12,9 +12,9 @@ import java.util.Arrays; */ public enum SalarySendStatusEnum implements BaseEnum { - UNSEND(0, "未发放", 93286), + UNSEND(0, SalaryI18nUtil.getI18nLabel(542695, "未发放"), 542695), ALREADYSEND(1, SalaryI18nUtil.getI18nLabel(542605, "已发放"), 542605), - WITHDRAW(2, "已撤回", 93287); + WITHDRAW(2, SalaryI18nUtil.getI18nLabel(32412, "已撤回"), 32412); private int value; diff --git a/src/com/engine/salary/enums/salarybill/SalaryTemplateReplenishRuleEnum.java b/src/com/engine/salary/enums/salarybill/SalaryTemplateReplenishRuleEnum.java index 0ff3b9b3b..e865e24e8 100644 --- a/src/com/engine/salary/enums/salarybill/SalaryTemplateReplenishRuleEnum.java +++ b/src/com/engine/salary/enums/salarybill/SalaryTemplateReplenishRuleEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.salarybill; +import com.engine.salary.util.SalaryI18nUtil; + /** * @author Harryxzy * @date 2022/12/02 15:44 @@ -7,9 +9,9 @@ package com.engine.salary.enums.salarybill; */ public enum SalaryTemplateReplenishRuleEnum { - ALL("ALL", "全部", 85155), + ALL("ALL", SalaryI18nUtil.getI18nLabel(332, "全部"), 332), - BYRULE("BYRULE", "按规则", 138972); + BYRULE("BYRULE", SalaryI18nUtil.getI18nLabel(542696, "按规则"), 542696); private String value; diff --git a/src/com/engine/salary/enums/salarybill/SalaryTemplateTextContentPositionEnum.java b/src/com/engine/salary/enums/salarybill/SalaryTemplateTextContentPositionEnum.java index d7e46be19..033c0c0de 100644 --- a/src/com/engine/salary/enums/salarybill/SalaryTemplateTextContentPositionEnum.java +++ b/src/com/engine/salary/enums/salarybill/SalaryTemplateTextContentPositionEnum.java @@ -1,13 +1,15 @@ package com.engine.salary.enums.salarybill; +import com.engine.salary.util.SalaryI18nUtil; + /** * @Description: 文本内容位置 * @Author: wangxiangzhong * @Date: 2021/12/9 13:22 */ public enum SalaryTemplateTextContentPositionEnum { - BEFORE(1, "薪资项目前", 92937), - AFTER(2, "薪资项目后", 92938); + BEFORE(1, SalaryI18nUtil.getI18nLabel(542697, "薪资项目前"), 542697), + AFTER(2, SalaryI18nUtil.getI18nLabel(542698, "薪资项目后"), 542698); private int value; diff --git a/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java b/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java index d3280e984..b8da9c1ff 100644 --- a/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java +++ b/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java @@ -9,7 +9,7 @@ import com.engine.salary.util.SalaryI18nUtil; */ public enum SalaryTemplateVarEnum { - CORPORATENAME("CORPORATENAME", "公司名称", 92936), + CORPORATENAME("CORPORATENAME", SalaryI18nUtil.getI18nLabel(1976, "公司名称"), 1976), SALARYYEARMONTH("SALARYYEARMONTH", SalaryI18nUtil.getI18nLabel(542604, "薪资所属月"), 542604); private String value; diff --git a/src/com/engine/salary/enums/salarybill/SalaryTemplateWhetherEnum.java b/src/com/engine/salary/enums/salarybill/SalaryTemplateWhetherEnum.java index e407d8262..f45730664 100644 --- a/src/com/engine/salary/enums/salarybill/SalaryTemplateWhetherEnum.java +++ b/src/com/engine/salary/enums/salarybill/SalaryTemplateWhetherEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.salarybill; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; /** @@ -8,8 +10,8 @@ import java.util.Arrays; * @Date: 2021/12/9 15:56 */ public enum SalaryTemplateWhetherEnum { - TRUE(1, "是", 84967), - FALSE(0, "否", 84968); + TRUE(1, SalaryI18nUtil.getI18nLabel(538048, "是"), 538048), + FALSE(0, SalaryI18nUtil.getI18nLabel(30587, "否"), 30587); private int value; diff --git a/src/com/engine/salary/enums/salaryformula/FormulaVarFieldTypeEnum.java b/src/com/engine/salary/enums/salaryformula/FormulaVarFieldTypeEnum.java index 661f34dbc..79b8c9af2 100644 --- a/src/com/engine/salary/enums/salaryformula/FormulaVarFieldTypeEnum.java +++ b/src/com/engine/salary/enums/salaryformula/FormulaVarFieldTypeEnum.java @@ -1,11 +1,13 @@ package com.engine.salary.enums.salaryformula; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; import java.util.Objects; public enum FormulaVarFieldTypeEnum { - NUMBER("number", "数值"), - STRING("string", "字符"); + NUMBER("number", SalaryI18nUtil.getI18nLabel(17639, "数值")), + STRING("string", SalaryI18nUtil.getI18nLabel(391259, "字符")); private String value; diff --git a/src/com/engine/salary/enums/salaryformula/ReferenceTypeEnum.java b/src/com/engine/salary/enums/salaryformula/ReferenceTypeEnum.java index b1f40e123..ea1198a3d 100644 --- a/src/com/engine/salary/enums/salaryformula/ReferenceTypeEnum.java +++ b/src/com/engine/salary/enums/salaryformula/ReferenceTypeEnum.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.Objects; public enum ReferenceTypeEnum { - FORMULA("formula", "公式"), + FORMULA("formula", SalaryI18nUtil.getI18nLabel(18125, "公式")), SQL("sql", "SQL"), BackCalc("backCalc", SalaryI18nUtil.getI18nLabel(542638, "回算")); diff --git a/src/com/engine/salary/enums/salaryformula/ReturnTypeEnum.java b/src/com/engine/salary/enums/salaryformula/ReturnTypeEnum.java index 19eb4835b..20629b163 100644 --- a/src/com/engine/salary/enums/salaryformula/ReturnTypeEnum.java +++ b/src/com/engine/salary/enums/salaryformula/ReturnTypeEnum.java @@ -1,11 +1,13 @@ package com.engine.salary.enums.salaryformula; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; import java.util.Objects; public enum ReturnTypeEnum { - NUMBER("number", "数值"), - STRING("string", "字符"); + NUMBER("number", SalaryI18nUtil.getI18nLabel(17639, "数值")), + STRING("string", SalaryI18nUtil.getI18nLabel(391259, "字符")); private String value; diff --git a/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java b/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java index 798d12f03..3ad294951 100644 --- a/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java +++ b/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java @@ -18,14 +18,14 @@ public enum SalaryFormulaReferenceEnum implements BaseEnum { SALARY_ITEM("salaryItem", SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), 542362), // SALARY_ITEM_OF_HISTORY("salaryItemOfHistory", "历史台账薪资项目", 85364), - EMPLOYEE_INFO("employeeInfo", "员工基本信息", 85366), + EMPLOYEE_INFO("employeeInfo", SalaryI18nUtil.getI18nLabel(542699, "员工基本信息"), 542699), SALARY_ARCHIVES("salaryArchives", SalaryI18nUtil.getI18nLabel(538004, "薪资档案"), 538004), - ATTEND("attend", "考勤引用", 85367), + ATTEND("attend", SalaryI18nUtil.getI18nLabel(538009, "考勤引用"), 538009), ADD_UP_SITUATION("addUpSituation", SalaryI18nUtil.getI18nLabel(538008, "往期累计情况"), 538008), ADD_UP_DEDUCTIONS("addUpDeductions", SalaryI18nUtil.getI18nLabel(538006, "累计专项附加扣除"), 538006), - WELFARE("welfare", "社保福利", 87522), + WELFARE("welfare", SalaryI18nUtil.getI18nLabel(537999, "社保福利"), 537999), OTHER_DEDUCTION("otherDeduction", SalaryI18nUtil.getI18nLabel(538007, "其他免税扣除"), 538007), - ISSUED("ISSUED", "已发", 0),; + ISSUED("ISSUED", SalaryI18nUtil.getI18nLabel(18524, "已发"), 18524),; ; private String value; diff --git a/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java b/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java index f08a583d2..f11051560 100644 --- a/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java +++ b/src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java @@ -2,6 +2,7 @@ package com.engine.salary.enums.salaryformula; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; import java.util.Objects; @@ -15,9 +16,9 @@ import java.util.Objects; **/ public enum SalarySQLReferenceEnum implements BaseEnum { - EMPLOYEE_INFO("employeeInfo", "员工基本信息", 85366), - SALARY_ACCT_EMPLOYEE("salaryAcctEmployee", "核算基本信息", 85368), - SALARY_CYCLE("SalaryCycle", "核算日期", 85368); + EMPLOYEE_INFO("employeeInfo", SalaryI18nUtil.getI18nLabel(542699, "员工基本信息"), 542699), + SALARY_ACCT_EMPLOYEE("salaryAcctEmployee", SalaryI18nUtil.getI18nLabel(542700, "核算基本信息"), 542700), + SALARY_CYCLE("SalaryCycle", SalaryI18nUtil.getI18nLabel(542701, "核算日期"), 542701); private String value; private String defaultLabel; diff --git a/src/com/engine/salary/enums/salaryformula/ValidateTypeEnum.java b/src/com/engine/salary/enums/salaryformula/ValidateTypeEnum.java index 4112b9ce5..f159b7065 100644 --- a/src/com/engine/salary/enums/salaryformula/ValidateTypeEnum.java +++ b/src/com/engine/salary/enums/salaryformula/ValidateTypeEnum.java @@ -1,11 +1,13 @@ package com.engine.salary.enums.salaryformula; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; import java.util.Objects; public enum ValidateTypeEnum { - NUMBER("number", "数值"), - STRING("string", "字符"); + NUMBER("number", SalaryI18nUtil.getI18nLabel(17639, "数值")), + STRING("string", SalaryI18nUtil.getI18nLabel(391259, "字符")); private String value; diff --git a/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java b/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java index 07bffd40c..eac770878 100644 --- a/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java +++ b/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.salaryitem; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; import java.util.Objects; @@ -14,8 +15,8 @@ import java.util.Objects; * @version 1.0 **/ public enum SalaryDataTypeEnum implements BaseEnum { - STRING("string", "字符", 105093), - NUMBER("number", "数值", 87625), + STRING("string", SalaryI18nUtil.getI18nLabel(391259, "字符"), 391259), + NUMBER("number", SalaryI18nUtil.getI18nLabel(17639, "数值"), 17639), ; private String value; diff --git a/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java b/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java index 36d9114c8..c6c0c978c 100644 --- a/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java +++ b/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java @@ -1,13 +1,14 @@ package com.engine.salary.enums.salarysend; import cn.hutool.core.util.StrUtil; +import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; import java.util.Objects; public enum SalarySendGrantTypeEnum { - GRANT("grant", "发放", 98590), - WITHDRAW("withdraw", "撤回", 93351); + GRANT("grant", SalaryI18nUtil.getI18nLabel(542702, "发放"), 542702), + WITHDRAW("withdraw", SalaryI18nUtil.getI18nLabel(32025, "撤回"), 32025); private String value; diff --git a/src/com/engine/salary/enums/salarysend/SalarySendRangeTargetTypeEnum.java b/src/com/engine/salary/enums/salarysend/SalarySendRangeTargetTypeEnum.java index adfc596d8..140aa2d8c 100644 --- a/src/com/engine/salary/enums/salarysend/SalarySendRangeTargetTypeEnum.java +++ b/src/com/engine/salary/enums/salarysend/SalarySendRangeTargetTypeEnum.java @@ -10,12 +10,12 @@ import java.util.Objects; @AllArgsConstructor @Getter public enum SalarySendRangeTargetTypeEnum implements BaseEnum { - USER(1, "人员", 100133), + USER(1, SalaryI18nUtil.getI18nLabel(30042,"人员"), 30042), DEPT(2, SalaryI18nUtil.getI18nLabel(27511,"部门"), 27511), - SUB_COMPANY(3, "分部", 107369), + SUB_COMPANY(3, SalaryI18nUtil.getI18nLabel(33553,"分部"), 33553), POSITION(4, SalaryI18nUtil.getI18nLabel(6086, "岗位"), 6086), // TAX_AGENT(5, SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"), 537996), - ALL(0, "所有人", 107729); + ALL(0, SalaryI18nUtil.getI18nLabel(1340, "所有人"), 1340); private final int value; diff --git a/src/com/engine/salary/enums/salarysend/SalarySendRangeTypeEnum.java b/src/com/engine/salary/enums/salarysend/SalarySendRangeTypeEnum.java index 95df85068..44e6eb2fa 100644 --- a/src/com/engine/salary/enums/salarysend/SalarySendRangeTypeEnum.java +++ b/src/com/engine/salary/enums/salarysend/SalarySendRangeTypeEnum.java @@ -13,7 +13,7 @@ import java.util.Optional; public enum SalarySendRangeTypeEnum implements BaseEnum { INCLUDE_OBJ(1, SalaryI18nUtil.getI18nLabel(106, "对象"), 106), - EXCLUDE_OBJ(2, "对象中排除", 142728); + EXCLUDE_OBJ(2, SalaryI18nUtil.getI18nLabel(542703, "对象中排除"), 542703); private final int value; diff --git a/src/com/engine/salary/enums/salarysob/IncomeCategoryEnum.java b/src/com/engine/salary/enums/salarysob/IncomeCategoryEnum.java index 6fc084f52..02da4e31c 100644 --- a/src/com/engine/salary/enums/salarysob/IncomeCategoryEnum.java +++ b/src/com/engine/salary/enums/salarysob/IncomeCategoryEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.salarysob; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; import java.util.Objects; @@ -14,12 +15,12 @@ import java.util.Objects; **/ public enum IncomeCategoryEnum implements BaseEnum { - WAGES_AND_SALARIES(1, "正常工资薪金所得", 98656), + WAGES_AND_SALARIES(1, SalaryI18nUtil.getI18nLabel(542704, "正常工资薪金所得"), 542704), - REMUNERATION_FOR_LABOR(4, "劳务报酬所得", 105218), + REMUNERATION_FOR_LABOR(4, SalaryI18nUtil.getI18nLabel(542705, "劳务报酬所得"), 542705), // 暂时注释掉，后续会开放 - ONETIME_ANNUAL_BONUS(2,"全年一次性奖金收入", 0) + ONETIME_ANNUAL_BONUS(2,SalaryI18nUtil.getI18nLabel(542706, "全年一次性奖金收入"), 542706) // // OTHER(11, "其他所得", 0), ; diff --git a/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java b/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java index e1b89f1fe..a2c622df6 100644 --- a/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java +++ b/src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java @@ -3,6 +3,7 @@ package com.engine.salary.enums.salarysob; import cn.hutool.core.util.ObjectUtil; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; import java.util.ArrayList; import java.util.Arrays; @@ -19,26 +20,26 @@ import java.util.Objects; **/ public enum SalaryEmployeeStatusEnum implements BaseEnum { -// ALL(10, "全部", 85155), +// ALL(10, SalaryI18nUtil.getI18nLabel(332, "全部"), 332), // //在职,对应人力资源表中状态，试用0，正式1，临时2，试用延期3 // NORMAL(1, "试用，正式，临时，临时延期", 100120), // //离职老,对应人力资源表中状态，解雇4，离职5，退休6 // UNAVAILABLE(2, "解雇，离职，退休", 85902), - TRIAL(0, "试用", 100121), + TRIAL(0, SalaryI18nUtil.getI18nLabel(18883, "试用"), 18883), - FORMAL(1, "正式", 100122), + FORMAL(1, SalaryI18nUtil.getI18nLabel(15711, "正式"), 15711), - TEMPORARY(2, "临时", 100123), + TEMPORARY(2, SalaryI18nUtil.getI18nLabel(480, "临时"), 480), - DELAY(3, "试用延期", 100124), + DELAY(3, SalaryI18nUtil.getI18nLabel(15844, "试用延期"), 15844), - FIRE(4, "解雇", 100125), + FIRE(4, SalaryI18nUtil.getI18nLabel(542707, "解雇"), 542707), - DEPARTURE(5, "离职", 100126), + DEPARTURE(5, SalaryI18nUtil.getI18nLabel(6091, "离职"), 6091), - RETIRED(6, "退休", 100127), + RETIRED(6, SalaryI18nUtil.getI18nLabel(6092, "退休"), 6092), ; private int value; diff --git a/src/com/engine/salary/enums/salarysob/SalarySobAdjustRuleTypeEnum.java b/src/com/engine/salary/enums/salarysob/SalarySobAdjustRuleTypeEnum.java index e79fe70da..4d825992f 100644 --- a/src/com/engine/salary/enums/salarysob/SalarySobAdjustRuleTypeEnum.java +++ b/src/com/engine/salary/enums/salarysob/SalarySobAdjustRuleTypeEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.salarysob; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; import java.util.Objects; @@ -14,10 +15,10 @@ import java.util.Objects; **/ public enum SalarySobAdjustRuleTypeEnum implements BaseEnum { - USE_BEFORE_ADJUSTMENT(1,"取调薪前薪资", 100121), - USE_AFTER_ADJUSTMENT(2, "取调薪后薪资",100131), - AVERAGE(3, "平均值", 100132), - PARTITION(4, "分段计薪",97005), + USE_BEFORE_ADJUSTMENT(1,SalaryI18nUtil.getI18nLabel(542708, "取调薪前薪资"), 542708), + USE_AFTER_ADJUSTMENT(2, SalaryI18nUtil.getI18nLabel(542709, "取调薪后薪资"),542709), + AVERAGE(3, SalaryI18nUtil.getI18nLabel(383791, "平均值"), 383791), + PARTITION(4, SalaryI18nUtil.getI18nLabel(542710, "分段计薪"),542710), ; SalarySobAdjustRuleTypeEnum(int value, String defaultLabel, int labelId) { diff --git a/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java b/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java index 114d5c391..f793cf3a9 100644 --- a/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java +++ b/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java @@ -17,11 +17,11 @@ import java.util.stream.Collectors; * @version 1.0 **/ public enum TargetTypeEnum implements BaseEnum { - EMPLOYEE(1, "人员", 100133), - DEPT(2, "部门", 27511), - SUBCOMPANY(3, "分部", 107369), + EMPLOYEE(1, SalaryI18nUtil.getI18nLabel(30042, "人员"), 30042), + DEPT(2, SalaryI18nUtil.getI18nLabel(6086, "部门"), 27511), + SUBCOMPANY(3, SalaryI18nUtil.getI18nLabel(33553, "分部"), 33553), POSITION(4, SalaryI18nUtil.getI18nLabel(6086, "岗位"), 6086), - ALL(5, "所有人", 107729); + ALL(5, SalaryI18nUtil.getI18nLabel(1340, "所有人"), 1340); // SECLEVE(6, "安全级别", 90382),; // EXT_EMPLOYEE(100, "外部人员", 0); diff --git a/src/com/engine/salary/enums/siaccount/BillStatusEnum.java b/src/com/engine/salary/enums/siaccount/BillStatusEnum.java index 2a98dc955..fd0070175 100644 --- a/src/com/engine/salary/enums/siaccount/BillStatusEnum.java +++ b/src/com/engine/salary/enums/siaccount/BillStatusEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.siaccount; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; /** * @Description: @@ -9,9 +10,9 @@ import com.engine.salary.enums.BaseEnum; * @Version: v1.0 */ public enum BillStatusEnum implements BaseEnum { - NOT_ARCHIVED(0, "未归档", 91870), + NOT_ARCHIVED(0, SalaryI18nUtil.getI18nLabel(17999, "未归档"), 17999), - ARCHIVED(1, "已归档", 91862); + ARCHIVED(1, SalaryI18nUtil.getI18nLabel(18800, "已归档"), 18800); private Integer value; diff --git a/src/com/engine/salary/enums/siaccount/EmployeeStatusEnum.java b/src/com/engine/salary/enums/siaccount/EmployeeStatusEnum.java index bf842cb2f..467156213 100644 --- a/src/com/engine/salary/enums/siaccount/EmployeeStatusEnum.java +++ b/src/com/engine/salary/enums/siaccount/EmployeeStatusEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.siaccount; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; /** @@ -13,11 +14,11 @@ import com.engine.salary.enums.BaseEnum; **/ public enum EmployeeStatusEnum implements BaseEnum { - STAY_ADD("1", "待增员", 106667), - PAYING("2", "正在缴纳", 106668), - STAY_DEL("3", "待减员", 106669), - STOP_PAYMENT_FROM_ADD("4", "停止缴纳-来自待增员", 106670), - STOP_PAYMENT_FROM_DEL("5", "停止缴纳-来自待减员", 106671); + STAY_ADD("1", SalaryI18nUtil.getI18nLabel(542711, "待增员"), 542711), + PAYING("2", SalaryI18nUtil.getI18nLabel(542712, "正在缴纳"), 542712), + STAY_DEL("3", SalaryI18nUtil.getI18nLabel(542713, "待减员"), 542713), + STOP_PAYMENT_FROM_ADD("4", SalaryI18nUtil.getI18nLabel(542714, "停止缴纳-来自待增员"), 542714), + STOP_PAYMENT_FROM_DEL("5", SalaryI18nUtil.getI18nLabel(542715, "停止缴纳-来自待减员"), 542715); private String value; diff --git a/src/com/engine/salary/enums/siaccount/PaymentStatusEnum.java b/src/com/engine/salary/enums/siaccount/PaymentStatusEnum.java index a81a9ab49..187a7b016 100644 --- a/src/com/engine/salary/enums/siaccount/PaymentStatusEnum.java +++ b/src/com/engine/salary/enums/siaccount/PaymentStatusEnum.java @@ -14,7 +14,7 @@ public enum PaymentStatusEnum implements BaseEnum { COMMON(0, SalaryI18nUtil.getI18nLabel(542444, "正常缴纳"), 542444), REPAIR(1, SalaryI18nUtil.getI18nLabel(542446, "补缴"), 542446), - PAYMENT(2,"代缴",121755), + PAYMENT(2,SalaryI18nUtil.getI18nLabel(542716, "代缴"),542716), RECESSION(3,SalaryI18nUtil.getI18nLabel(542447, "退差"),542447), BALANCE(4,SalaryI18nUtil.getI18nLabel(27163, "补差"),27163); diff --git a/src/com/engine/salary/enums/siaccount/ProjectTypeEnum.java b/src/com/engine/salary/enums/siaccount/ProjectTypeEnum.java index 57dbd6d6b..86c7bf65f 100644 --- a/src/com/engine/salary/enums/siaccount/ProjectTypeEnum.java +++ b/src/com/engine/salary/enums/siaccount/ProjectTypeEnum.java @@ -5,10 +5,10 @@ import com.engine.salary.util.SalaryI18nUtil; public enum ProjectTypeEnum implements BaseEnum { - ALL(0, "全部", 85155), + ALL(0, SalaryI18nUtil.getI18nLabel(332, "全部"), 332), SOCIAL(1, SalaryI18nUtil.getI18nLabel(538967, "社保"), 538967), FUND(2, SalaryI18nUtil.getI18nLabel(538969, "公积金"), 538969), - OTHER(3, "企业年金及其他福利", 93112), + OTHER(3, SalaryI18nUtil.getI18nLabel(542717, "企业年金及其他福利"), 542717), ENDOWMENT_INSURANCE(4, SalaryI18nUtil.getI18nLabel(542517, "养老保险"), 542517), MEDICAL_INSURANCE(5, SalaryI18nUtil.getI18nLabel(25139, "医疗保险"), 25139); diff --git a/src/com/engine/salary/enums/siaccount/ResourceFromEnum.java b/src/com/engine/salary/enums/siaccount/ResourceFromEnum.java index 7b50b909d..3aa8ee787 100644 --- a/src/com/engine/salary/enums/siaccount/ResourceFromEnum.java +++ b/src/com/engine/salary/enums/siaccount/ResourceFromEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.siaccount; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; /** * @Description: @@ -10,11 +11,11 @@ import com.engine.salary.enums.BaseEnum; */ public enum ResourceFromEnum implements BaseEnum { - SYSTEM(0, "系统核算", 92268), + SYSTEM(0, SalaryI18nUtil.getI18nLabel(542718, "系统核算"), 542718), - Temporary(1, "临时", 92269), + Temporary(1, SalaryI18nUtil.getI18nLabel(480, "临时"), 480), - IMPORT(2,"导入",87622); + IMPORT(2, SalaryI18nUtil.getI18nLabel(32935, "导入"),32935); private Integer value; diff --git a/src/com/engine/salary/enums/sicategory/DataTypeEnum.java b/src/com/engine/salary/enums/sicategory/DataTypeEnum.java index 4f67851eb..1de9cf92e 100644 --- a/src/com/engine/salary/enums/sicategory/DataTypeEnum.java +++ b/src/com/engine/salary/enums/sicategory/DataTypeEnum.java @@ -12,7 +12,7 @@ public enum DataTypeEnum { CUSTOM(0, SalaryI18nUtil.getI18nLabel(131372, "自定义")), - SYSTEM(1, SalaryI18nUtil.getI18nLabel(542401, "系统")); + SYSTEM(1, SalaryI18nUtil.getI18nLabel(468, "系统")); private Integer value; diff --git a/src/com/engine/salary/enums/sicategory/DeleteTypeEnum.java b/src/com/engine/salary/enums/sicategory/DeleteTypeEnum.java index 6e3845b34..b89aa8174 100644 --- a/src/com/engine/salary/enums/sicategory/DeleteTypeEnum.java +++ b/src/com/engine/salary/enums/sicategory/DeleteTypeEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.sicategory; +import com.engine.salary.util.SalaryI18nUtil; + /** * @Description: * @Author: zhangheng @@ -8,9 +10,9 @@ package com.engine.salary.enums.sicategory; */ public enum DeleteTypeEnum { - NOT_DELETED(0, "未删除"), + NOT_DELETED(0, SalaryI18nUtil.getI18nLabel(21269, "未删除")), - DELETED(1, "已删除"); + DELETED(1, SalaryI18nUtil.getI18nLabel(18967, "已删除")); private Integer value; diff --git a/src/com/engine/salary/enums/sicategory/IncludeTypeEnum.java b/src/com/engine/salary/enums/sicategory/IncludeTypeEnum.java index 582e156c1..1b2fb2335 100644 --- a/src/com/engine/salary/enums/sicategory/IncludeTypeEnum.java +++ b/src/com/engine/salary/enums/sicategory/IncludeTypeEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.sicategory; +import com.engine.salary.util.SalaryI18nUtil; + /** * @Description: * @Author: zhangheng @@ -7,8 +9,8 @@ package com.engine.salary.enums.sicategory; * @Version: v1.0 */ public enum IncludeTypeEnum { - INCLUDE(1, "包含"), - EXCLUDE(0, "不包含"); + INCLUDE(1, SalaryI18nUtil.getI18nLabel(346, "包含")), + EXCLUDE(0, SalaryI18nUtil.getI18nLabel(15507, "不包含")); private Integer value; private String desc; diff --git a/src/com/engine/salary/enums/sicategory/IsPaymentEnum.java b/src/com/engine/salary/enums/sicategory/IsPaymentEnum.java index 4897625d8..3eaf32aa6 100644 --- a/src/com/engine/salary/enums/sicategory/IsPaymentEnum.java +++ b/src/com/engine/salary/enums/sicategory/IsPaymentEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.sicategory; +import com.engine.salary.util.SalaryI18nUtil; + /** * @Description: * @Author: zhangheng @@ -7,9 +9,9 @@ package com.engine.salary.enums.sicategory; * @Version: v1.0 */ public enum IsPaymentEnum { - YES(1, "缴费"), + YES(1, SalaryI18nUtil.getI18nLabel(542719, "缴费")), - NO(0, "不缴费"); + NO(0, SalaryI18nUtil.getI18nLabel(542720, "不缴费")); private Integer value; private String desc; diff --git a/src/com/engine/salary/enums/sicategory/IsUseEnum.java b/src/com/engine/salary/enums/sicategory/IsUseEnum.java index a5497f4b6..ade1b6ef7 100644 --- a/src/com/engine/salary/enums/sicategory/IsUseEnum.java +++ b/src/com/engine/salary/enums/sicategory/IsUseEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.sicategory; +import com.engine.salary.util.SalaryI18nUtil; + /** * @Description: * @Author: zhangheng @@ -7,9 +9,9 @@ package com.engine.salary.enums.sicategory; * @Version: v1.0 */ public enum IsUseEnum { - START(1, "启用"), + START(1, SalaryI18nUtil.getI18nLabel(26472, "启用")), - STOP(0, "停用"); + STOP(0, SalaryI18nUtil.getI18nLabel(26471, "停用")); private Integer value; diff --git a/src/com/engine/salary/enums/sicategory/NonPaymentEnum.java b/src/com/engine/salary/enums/sicategory/NonPaymentEnum.java index 169ca12cb..35b56d8fd 100644 --- a/src/com/engine/salary/enums/sicategory/NonPaymentEnum.java +++ b/src/com/engine/salary/enums/sicategory/NonPaymentEnum.java @@ -12,7 +12,7 @@ public enum NonPaymentEnum { YES(0, SalaryI18nUtil.getI18nLabel(542461, "缴纳")), - NO(1, "不缴纳"); + NO(1, SalaryI18nUtil.getI18nLabel(542721, "不缴纳")); private Integer value; diff --git a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java index 24dee254d..61d50a19f 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java @@ -117,7 +117,7 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic // attendQuotes.forEach(e -> { // SalaryLoggerUtil.recordDeleteSingleLog(attendQuoteLoggerTemplate, // e.getId(), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85367, "考勤引用"), +// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 538009, "考勤引用"), // SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100412, "删除考勤引用"), // SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100412, "删除考勤引用") + // "：[" + SalaryI18nUtil.getI18nLabel(542604, "薪资所属月") + "：" + e.getSalaryYearMonth() + "，" +