From e71574bc67e7f8fd5342e214677a237f7b201229 Mon Sep 17 00:00:00 2001 From: sy Date: Sat, 6 May 2023 16:07:12 +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?0506?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/SalaryCheckResultListDTO.java | 2 +- .../dto/SalaryCheckResultRecordListDTO.java | 2 +- .../dto/SalarySobCheckRuleFormDTO.java | 2 +- .../engine/salary/enums/OperateTypeEnum.java | 4 +- .../salary/enums/SalaryDataSourceEnum.java | 6 +-- .../salary/enums/SalaryItemCategoryEnum.java | 16 ++++---- .../salary/enums/SalaryItemTypeEnum.java | 40 +++++++++---------- .../salary/enums/SalaryJobFlagEnum.java | 6 ++- .../salary/enums/SalaryRoundingModeEnum.java | 14 ++++--- .../salary/enums/SalarySobStatusEnum.java | 6 +-- .../salary/enums/SalarySystemTypeEnum.java | 6 ++- .../engine/salary/enums/UserStatusEnum.java | 2 +- .../enums/sicategory/PaymentTypeEnum.java | 5 ++- .../enums/sicategory/RententionRuleEnum.java | 11 ++--- .../enums/sicategory/SharedTypeEnum.java | 5 ++- .../taxagent/TaxAgentEmpChangeModuleEnum.java | 2 +- .../taxagent/TaxAgentEmpChangeTypeEnum.java | 2 +- .../enums/taxagent/TaxAgentRoleTypeEnum.java | 2 +- .../transmethod/SISchemeTransMethod.java | 6 ++- .../transmethod/TaxRateTransMethod.java | 7 ++-- 20 files changed, 80 insertions(+), 66 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultListDTO.java index c4016c4fc..2c77bdbf6 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultListDTO.java @@ -58,7 +58,7 @@ // // @SalaryTableColumn( // label = "校验规则", -// labelId = 86126, +// labelId = 83194, // width = "50%" // ) // //校验规则公式内容") diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultRecordListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultRecordListDTO.java index 54be7ac71..24d119077 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryCheckResultRecordListDTO.java @@ -43,7 +43,7 @@ // // @SalaryTableColumn( // label = "校验规则", -// labelId = 86126, +// labelId = 83194, // width = "50%" // ) // //校验规则公式内容") diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java index eb1a50f1f..23c8556ba 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java @@ -37,7 +37,7 @@ public class SalarySobCheckRuleFormDTO { // @SalaryForm( // label = "校验规则", -// labelId = 86126, +// labelId = 83194, // items = @SalaryFormItem(itemType = WeaFormItemType.INPUT, required = true) // ) //校验规则") diff --git a/src/com/engine/salary/enums/OperateTypeEnum.java b/src/com/engine/salary/enums/OperateTypeEnum.java index 51d4200eb..d46aec7ec 100644 --- a/src/com/engine/salary/enums/OperateTypeEnum.java +++ b/src/com/engine/salary/enums/OperateTypeEnum.java @@ -9,8 +9,8 @@ import com.engine.salary.util.SalaryI18nUtil; */ public enum OperateTypeEnum { - ADD("1", "新增"), - UPDATE("2", "更新"), + ADD("1", SalaryI18nUtil.getI18nLabel(1421, "新增")), + UPDATE("2", SalaryI18nUtil.getI18nLabel(17744, "更新")), DELETE("4", SalaryI18nUtil.getI18nLabel(535052, "删除")); private String value; diff --git a/src/com/engine/salary/enums/SalaryDataSourceEnum.java b/src/com/engine/salary/enums/SalaryDataSourceEnum.java index 7f3587309..384979bbc 100644 --- a/src/com/engine/salary/enums/SalaryDataSourceEnum.java +++ b/src/com/engine/salary/enums/SalaryDataSourceEnum.java @@ -16,14 +16,14 @@ import java.util.Objects; public enum SalaryDataSourceEnum implements BaseEnum { INPUT_IMPORT(0, SalaryI18nUtil.getI18nLabel(542339, "输入/导入"), 542339), - CUSTOM_FORMULA(1, "自定义公式", 92001), + CUSTOM_FORMULA(1, SalaryI18nUtil.getI18nLabel(502403, "自定义公式"), 502403), SALARY_ITEM(2, SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), 542362), EMPLOYEE_INFO(3, SalaryI18nUtil.getI18nLabel(542699, "员工基本信息"), 542699), SALARY_ARCHIVES(4, SalaryI18nUtil.getI18nLabel(538004, "薪资档案"), 538004), - CUMULATIVE_SITUATION(5, "累计情况（工资、薪金）", 87521), + CUMULATIVE_SITUATION(5, SalaryI18nUtil.getI18nLabel(542728, "累计情况（工资、薪金）"), 542728), SPE_ADDI_DEDUCTIONS(6, SalaryI18nUtil.getI18nLabel(538006, "累计专项附加扣除"), 538006), SOCIAL_SECURITY(7, SalaryI18nUtil.getI18nLabel(537999, "社保福利"), 537999), - OTHER_DEDUCTION(8, "其他扣除", 85831), + OTHER_DEDUCTION(8, SalaryI18nUtil.getI18nLabel(542729, "其他扣除"), 542729), ; private int value; diff --git a/src/com/engine/salary/enums/SalaryItemCategoryEnum.java b/src/com/engine/salary/enums/SalaryItemCategoryEnum.java index 84585d22a..5473ebec6 100644 --- a/src/com/engine/salary/enums/SalaryItemCategoryEnum.java +++ b/src/com/engine/salary/enums/SalaryItemCategoryEnum.java @@ -1,6 +1,8 @@ package com.engine.salary.enums; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Objects; /** @@ -12,13 +14,13 @@ import java.util.Objects; */ public enum SalaryItemCategoryEnum implements BaseEnum { - PRE_TAX_ADD(1, "税前加项", 84492), - PRE_TAX_DUD(2, "税前减项", 84493), - AFTER_TAX_ADD(3, "税后加项", 84494), - AFTER_TAX_DUD(4, "税后减项", 84495), - SUM(5, "统计项", 84497), - TAX(6, "税费项", 84498), - OTHER(7, "其他项", 84499); + PRE_TAX_ADD(1, SalaryI18nUtil.getI18nLabel(542730, "税前加项"), 542730), + PRE_TAX_DUD(2, SalaryI18nUtil.getI18nLabel(542731, "税前减项"), 542731), + AFTER_TAX_ADD(3, SalaryI18nUtil.getI18nLabel(542732, "税后加项"), 542732), + AFTER_TAX_DUD(4, SalaryI18nUtil.getI18nLabel(542733, "税后减项"), 542733), + SUM(5, SalaryI18nUtil.getI18nLabel(16893, "统计项"), 16893), + TAX(6, SalaryI18nUtil.getI18nLabel(542734, "税费项"), 542734), + OTHER(7, SalaryI18nUtil.getI18nLabel(542735, "其他项"), 542735); private int value; diff --git a/src/com/engine/salary/enums/SalaryItemTypeEnum.java b/src/com/engine/salary/enums/SalaryItemTypeEnum.java index afce03ce4..74b6f8976 100644 --- a/src/com/engine/salary/enums/SalaryItemTypeEnum.java +++ b/src/com/engine/salary/enums/SalaryItemTypeEnum.java @@ -14,28 +14,28 @@ import java.util.Objects; */ public enum SalaryItemTypeEnum implements BaseEnum { - SALARY(1, SalaryItemCategoryEnum.PRE_TAX_ADD, "工资薪金", 85818), - BONUS(2, SalaryItemCategoryEnum.PRE_TAX_ADD, "全年一次性奖金", 85820), - INTEREST_DIVIDEND(3, SalaryItemCategoryEnum.PRE_TAX_ADD, "利息股息红利", 85821), - LABOR_REMUNERATION(4, SalaryItemCategoryEnum.PRE_TAX_ADD, "劳务报酬", 85822), - REMUNERATION(5, SalaryItemCategoryEnum.PRE_TAX_ADD, "稿酬", 85823), - ROYALTIES(6, SalaryItemCategoryEnum.PRE_TAX_ADD, "特许权使用费", 85824), - ACCIDENTAL_INCOME(7, SalaryItemCategoryEnum.PRE_TAX_ADD, "偶然所得", 85825), - SEVERANCE_COMPENSATION(8, SalaryItemCategoryEnum.PRE_TAX_ADD, "离职补偿金", 85826), - PRE_TAX_DEDUCTION(9, SalaryItemCategoryEnum.PRE_TAX_DUD, "税前扣款", 85828), - SPECIAL_DEDUCTION(10, SalaryItemCategoryEnum.PRE_TAX_DUD, "专项扣除", 85829), + SALARY(1, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542736, "工资薪金"), 542736), + BONUS(2, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542737, "全年一次性奖金"), 542737), + INTEREST_DIVIDEND(3, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542738, "利息股息红利"), 542738), + LABOR_REMUNERATION(4, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542739, "劳务报酬"), 542739), + REMUNERATION(5, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542740, "稿酬"), 542740), + ROYALTIES(6, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542741, "特许权使用费"), 542741), + ACCIDENTAL_INCOME(7, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542742, "偶然所得"), 542742), + SEVERANCE_COMPENSATION(8, SalaryItemCategoryEnum.PRE_TAX_ADD, SalaryI18nUtil.getI18nLabel(542743, "离职补偿金"), 542743), + PRE_TAX_DEDUCTION(9, SalaryItemCategoryEnum.PRE_TAX_DUD, SalaryI18nUtil.getI18nLabel(542744, "税前扣款"), 542744), + SPECIAL_DEDUCTION(10, SalaryItemCategoryEnum.PRE_TAX_DUD, SalaryI18nUtil.getI18nLabel(542745, "专项扣除"), 542745), SPECIAL_ADDITIONAL_DEDUCTION(11, SalaryItemCategoryEnum.PRE_TAX_DUD, SalaryI18nUtil.getI18nLabel(507216, "专项附加扣除"), 507216), - OTHER_DEDUCTIONS(12, SalaryItemCategoryEnum.PRE_TAX_DUD, "其他扣除", 85831), - AFTER_TAX_REIMBURSEMENT(13, SalaryItemCategoryEnum.AFTER_TAX_ADD, "税后报销", 85832), - AFTER_TAX_ADJUSTMENT(14, SalaryItemCategoryEnum.AFTER_TAX_ADD, "税后调整", 85833), - AFTER_TAX_DEDUCTION(15, SalaryItemCategoryEnum.AFTER_TAX_DUD, "税后扣款", 85834), - TAX(16, SalaryItemCategoryEnum.TAX, "税费", 85835), + OTHER_DEDUCTIONS(12, SalaryItemCategoryEnum.PRE_TAX_DUD, SalaryI18nUtil.getI18nLabel(542729, "其他扣除"), 542729), + AFTER_TAX_REIMBURSEMENT(13, SalaryItemCategoryEnum.AFTER_TAX_ADD, SalaryI18nUtil.getI18nLabel(542746, "税后报销"), 542746), + AFTER_TAX_ADJUSTMENT(14, SalaryItemCategoryEnum.AFTER_TAX_ADD, SalaryI18nUtil.getI18nLabel(542747, "税后调整"), 542747), + AFTER_TAX_DEDUCTION(15, SalaryItemCategoryEnum.AFTER_TAX_DUD, SalaryI18nUtil.getI18nLabel(542748, "税后扣款"), 542748), + TAX(16, SalaryItemCategoryEnum.TAX, SalaryI18nUtil.getI18nLabel(513840, "税费"), 513840), 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), - OTHER_LOGIC(21, SalaryItemCategoryEnum.OTHER, "其他逻辑", 100116), - STATISTICAL_ITEM(22, SalaryItemCategoryEnum.SUM, "统计项", 84497), + ATTEND_INFO(20, SalaryItemCategoryEnum.OTHER, SalaryI18nUtil.getI18nLabel(542749, "员工考勤信息"), 542749), + OTHER(19, SalaryItemCategoryEnum.OTHER, SalaryI18nUtil.getI18nLabel(542750, "其他数值"), 542750), + TEXT(17, SalaryItemCategoryEnum.OTHER, SalaryI18nUtil.getI18nLabel(542751, "其他文本"), 542751), + OTHER_LOGIC(21, SalaryItemCategoryEnum.OTHER, SalaryI18nUtil.getI18nLabel(542752, "其他逻辑"), 542752), + STATISTICAL_ITEM(22, SalaryItemCategoryEnum.SUM, SalaryI18nUtil.getI18nLabel(16893, "统计项"), 16893), ; private int value; diff --git a/src/com/engine/salary/enums/SalaryJobFlagEnum.java b/src/com/engine/salary/enums/SalaryJobFlagEnum.java index 6309c0b74..4216f36ca 100644 --- a/src/com/engine/salary/enums/SalaryJobFlagEnum.java +++ b/src/com/engine/salary/enums/SalaryJobFlagEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums; +import com.engine.salary.util.SalaryI18nUtil; + /** * 个税扣缴义务人角色类型 *

Copyright: Copyright (c) 2022

@@ -9,8 +11,8 @@ package com.engine.salary.enums; * @version 1.0 **/ public enum SalaryJobFlagEnum { - normal("normal", "在职"), - unavailable("unavailable", "非在职"); + normal("normal", SalaryI18nUtil.getI18nLabel(1831, "在职")), + unavailable("unavailable", SalaryI18nUtil.getI18nLabel(542753, "非在职")); private String value; diff --git a/src/com/engine/salary/enums/SalaryRoundingModeEnum.java b/src/com/engine/salary/enums/SalaryRoundingModeEnum.java index 288aa7b07..33acca82c 100644 --- a/src/com/engine/salary/enums/SalaryRoundingModeEnum.java +++ b/src/com/engine/salary/enums/SalaryRoundingModeEnum.java @@ -1,6 +1,8 @@ package com.engine.salary.enums; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Arrays; import java.util.Objects; @@ -14,12 +16,12 @@ import java.util.Objects; **/ public enum SalaryRoundingModeEnum implements BaseEnum { - RAW_DATA(1, "原始数据", 84504), - ROUNDING(2, "四舍五入", 84505), - ROUND_UP(3, "向上舍入", 84506), - ROUND_DOWN(4, "向下舍入", 84507), - CEILING(5, "见分进角", 84507), - UP_EVEN(6, "向上求偶", 84507); + RAW_DATA(1, SalaryI18nUtil.getI18nLabel(19766, "原始数据"), 19766), + ROUNDING(2, SalaryI18nUtil.getI18nLabel(389654, "四舍五入"), 389654), + ROUND_UP(3, SalaryI18nUtil.getI18nLabel(542722, "向上舍入"), 542722), + ROUND_DOWN(4, SalaryI18nUtil.getI18nLabel(542723, "向下舍入"), 542723), + CEILING(5, SalaryI18nUtil.getI18nLabel(542724, "见分进角"), 542724), + UP_EVEN(6, SalaryI18nUtil.getI18nLabel(542725, "向上求偶"), 542725); private int value; diff --git a/src/com/engine/salary/enums/SalarySobStatusEnum.java b/src/com/engine/salary/enums/SalarySobStatusEnum.java index fbafbc584..3e6fa0c40 100644 --- a/src/com/engine/salary/enums/SalarySobStatusEnum.java +++ b/src/com/engine/salary/enums/SalarySobStatusEnum.java @@ -12,12 +12,12 @@ import com.engine.salary.util.SalaryI18nUtil; */ public enum SalarySobStatusEnum implements BaseEnum { - START(0, "开始", 86123), + START(0, SalaryI18nUtil.getI18nLabel(530, "开始"), 530), BASIC_INFO(1, SalaryI18nUtil.getI18nLabel(82743, "基础信息"), 82743), EMPLOYEE_SCOPE(2, SalaryI18nUtil.getI18nLabel(124810, "人员范围"), 124810), SALARY_ITEM(3, SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), 542362), - CHECK_RULE(4, "校验规则", 86126), - END(99, "结束", 86127); + CHECK_RULE(4, SalaryI18nUtil.getI18nLabel(83194, "校验规则"), 83194), + END(99, SalaryI18nUtil.getI18nLabel(405, "结束"), 405); private int value; diff --git a/src/com/engine/salary/enums/SalarySystemTypeEnum.java b/src/com/engine/salary/enums/SalarySystemTypeEnum.java index 8ce14a0dc..439e38a3d 100644 --- a/src/com/engine/salary/enums/SalarySystemTypeEnum.java +++ b/src/com/engine/salary/enums/SalarySystemTypeEnum.java @@ -1,6 +1,8 @@ package com.engine.salary.enums; +import com.engine.salary.util.SalaryI18nUtil; + import java.util.Objects; /** @@ -12,8 +14,8 @@ import java.util.Objects; */ public enum SalarySystemTypeEnum implements BaseEnum { - CUSTOM(0, "自定义表单", 83993), - SYSTEM(1, "系统表单", 83994), + CUSTOM(0, SalaryI18nUtil.getI18nLabel(125026, "自定义表单"), 125026), + SYSTEM(1, SalaryI18nUtil.getI18nLabel(125027, "系统表单"), 125027), ; private int value; diff --git a/src/com/engine/salary/enums/UserStatusEnum.java b/src/com/engine/salary/enums/UserStatusEnum.java index 7e7e03ca8..c450715fc 100644 --- a/src/com/engine/salary/enums/UserStatusEnum.java +++ b/src/com/engine/salary/enums/UserStatusEnum.java @@ -23,7 +23,7 @@ public enum UserStatusEnum implements BaseEnum { FIRE(4, SalaryI18nUtil.getI18nLabel(542707, "解雇"), 542707), DEPARTURE(5, SalaryI18nUtil.getI18nLabel(6091, "离职"), 6091), RETIRED(6, SalaryI18nUtil.getI18nLabel(6092, "退休"), 6092), - INVALID(7, SalaryI18nUtil.getI18nLabel(6091, "无效"), 1); + INVALID(7, SalaryI18nUtil.getI18nLabel(2245, "无效"), 2245); private Integer value; private String defaultLabel; diff --git a/src/com/engine/salary/enums/sicategory/PaymentTypeEnum.java b/src/com/engine/salary/enums/sicategory/PaymentTypeEnum.java index 2bcb6dce5..cec64cd5e 100644 --- a/src/com/engine/salary/enums/sicategory/PaymentTypeEnum.java +++ b/src/com/engine/salary/enums/sicategory/PaymentTypeEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums.sicategory; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; /** * @Description: @@ -9,8 +10,8 @@ import com.engine.salary.enums.BaseEnum; * @Version: v1.0 */ public enum PaymentTypeEnum implements BaseEnum { - SCHEME_TOWN(1, "城镇", 87410), - SCHEME_VILLAGE(2, "农村", 87411); + SCHEME_TOWN(1, SalaryI18nUtil.getI18nLabel(19702, "城镇"), 19702), + SCHEME_VILLAGE(2, SalaryI18nUtil.getI18nLabel(19703, "农村"), 19703); private Integer value; diff --git a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java index 0605dfa67..a0ee9ee3e 100644 --- a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java +++ b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java @@ -2,6 +2,7 @@ package com.engine.salary.enums.sicategory; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; import java.math.BigDecimal; import java.util.Arrays; @@ -15,11 +16,11 @@ import java.util.Arrays; * @version 1.0 **/ public enum RententionRuleEnum implements BaseEnum { - ROUND(BigDecimal.ROUND_HALF_UP, "四舍五入", 84505), - CEIL(BigDecimal.ROUND_UP, "向上舍入", 84506), - FLOOR(BigDecimal.ROUND_DOWN, "向下舍入", 84507), - CEILING(5, "见分进角", 84507), - UP_EVEN(6, "向上求偶", 84507); + ROUND(BigDecimal.ROUND_HALF_UP, SalaryI18nUtil.getI18nLabel(389654, "四舍五入"), 389654), + CEIL(BigDecimal.ROUND_UP, SalaryI18nUtil.getI18nLabel(542722, "向上舍入"), 542722), + FLOOR(BigDecimal.ROUND_DOWN, SalaryI18nUtil.getI18nLabel(542723, "向下舍入"), 542723), + CEILING(5, SalaryI18nUtil.getI18nLabel(542724, "见分进角"), 542724), + UP_EVEN(6, SalaryI18nUtil.getI18nLabel(542725, "向上求偶"), 542725); private int value; diff --git a/src/com/engine/salary/enums/sicategory/SharedTypeEnum.java b/src/com/engine/salary/enums/sicategory/SharedTypeEnum.java index 7ff3d03cd..748c23337 100644 --- a/src/com/engine/salary/enums/sicategory/SharedTypeEnum.java +++ b/src/com/engine/salary/enums/sicategory/SharedTypeEnum.java @@ -1,11 +1,12 @@ package com.engine.salary.enums.sicategory; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.util.SalaryI18nUtil; public enum SharedTypeEnum implements BaseEnum { - PUBLIC("0", "公共", 86568), - PRIVATE("1", "私有", 86569); + PUBLIC("0", SalaryI18nUtil.getI18nLabel(126818, "公共"), 126818), + PRIVATE("1", SalaryI18nUtil.getI18nLabel(385722, "私有"), 385722); private String value; diff --git a/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java b/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java index 819ca7674..1bd998687 100644 --- a/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java +++ b/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java @@ -13,7 +13,7 @@ import com.engine.salary.util.SalaryI18nUtil; public enum TaxAgentEmpChangeModuleEnum { SALARY_ARCHIVE(1, SalaryI18nUtil.getI18nLabel(538004, "薪资档案")), - INSURANCE_ARCHIVE(2, "社保档案"); + INSURANCE_ARCHIVE(2, SalaryI18nUtil.getI18nLabel(542726, "社保档案")); private int value; diff --git a/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeTypeEnum.java b/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeTypeEnum.java index c0abf2a65..2ca4c284f 100644 --- a/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeTypeEnum.java +++ b/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeTypeEnum.java @@ -12,7 +12,7 @@ import com.engine.salary.util.SalaryI18nUtil; **/ public enum TaxAgentEmpChangeTypeEnum { - ADD(1, "新增"), + ADD(1, SalaryI18nUtil.getI18nLabel(1421, "新增")), DEL(2, SalaryI18nUtil.getI18nLabel(535052, "删除")); private int value; diff --git a/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java b/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java index c6d3cc2ee..070c34fe6 100644 --- a/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java +++ b/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java @@ -9,7 +9,7 @@ import com.engine.salary.util.SalaryI18nUtil; */ public enum TaxAgentRoleTypeEnum { - CHIEF(0, "总管理员"), + CHIEF(0, SalaryI18nUtil.getI18nLabel(542727, "总管理员")), ADMIN(1, SalaryI18nUtil.getI18nLabel(1507, "管理员")), SUBADMIN(2, SalaryI18nUtil.getI18nLabel(542658, "分管理员")), NONE(3, SalaryI18nUtil.getI18nLabel(25740, "其他")); diff --git a/src/com/engine/salary/transmethod/SISchemeTransMethod.java b/src/com/engine/salary/transmethod/SISchemeTransMethod.java index 634cc132a..77ee040d1 100644 --- a/src/com/engine/salary/transmethod/SISchemeTransMethod.java +++ b/src/com/engine/salary/transmethod/SISchemeTransMethod.java @@ -1,5 +1,7 @@ package com.engine.salary.transmethod; +import com.engine.salary.util.SalaryI18nUtil; + /** * 社保福利转换 */ @@ -7,9 +9,9 @@ public class SISchemeTransMethod { public static String getPaymentType(String type) { switch (type) { case "1": - return "城镇"; + return SalaryI18nUtil.getI18nLabel(19702, "城镇"); case "2": - return "农村"; + return SalaryI18nUtil.getI18nLabel(19703, "农村"); default: return ""; } diff --git a/src/com/engine/salary/transmethod/TaxRateTransMethod.java b/src/com/engine/salary/transmethod/TaxRateTransMethod.java index f9c8144a0..b041e02d0 100644 --- a/src/com/engine/salary/transmethod/TaxRateTransMethod.java +++ b/src/com/engine/salary/transmethod/TaxRateTransMethod.java @@ -1,5 +1,6 @@ package com.engine.salary.transmethod; +import com.engine.salary.util.SalaryI18nUtil; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -8,11 +9,11 @@ public class TaxRateTransMethod { public static String getSystemTypeName(String type) { switch (type) { case "1": - return "系统表单"; + return SalaryI18nUtil.getI18nLabel(125027, "系统表单"); case "0": - return "自定义表单"; + return SalaryI18nUtil.getI18nLabel(125026, "自定义表单"); default: - return "自定义表单"; + return SalaryI18nUtil.getI18nLabel(125026, "自定义表单"); } }