diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index c2fe85aac..ffa0be6b5 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1262,6 +1262,7 @@ public class SIArchivesBiz extends Service { InsuranceArchivesSocialSchemePO socialItem = socialSchemePOMap.get(item.getSocialId()); InsuranceArchivesFundSchemePO fundItem = fundSchemePOMap.get(item.getFundId()); InsuranceArchivesOtherSchemePO otherItem = otherSchemePOMap.get(item.getOtherId()); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(item.getUserStatus()); Map map = new HashMap<>(); map.put("employeeName", item.getUserName()); map.put("paymentOrganizationName", longTaxAgentPOMap.get(item.getPaymentOrganization()) != null ? longTaxAgentPOMap.get(item.getPaymentOrganization()).getName() : ""); @@ -1275,7 +1276,8 @@ public class SIArchivesBiz extends Service { map.put("siSchemeId", item.getSiSchemeId()); map.put("fundSchemeId", item.getFundSchemeId()); map.put("otherSchemeId", item.getOtherSchemeId()); - map.put("status", item.getUserStatus() != null ? UserStatusEnum.getDefaultLabelByValue(item.getUserStatus()) : ""); +// map.put("status", item.getUserStatus() != null ? UserStatusEnum.getDefaultLabelByValue(item.getUserStatus()) : ""); + map.put("status", item.getUserStatus() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel()) : ""); map.put("baseInfo", item.getBaseInfoId()); map.put("paymentOrganization", item.getPaymentOrganization()); if (socialItem != null) { diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java index cd0d338fc..1bf133d80 100644 --- a/src/com/engine/salary/biz/SISchemeBiz.java +++ b/src/com/engine/salary/biz/SISchemeBiz.java @@ -80,7 +80,8 @@ public class SISchemeBiz extends Service { .id((long) (Math.random() * 10000)) .insuranceId(item.getId()) .insuranceName(item.getInsuranceName()) - .paymentScope(e.getDefaultLabel()) +// .paymentScope(e.getDefaultLabel()) + .paymentScope(SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(), e.getDefaultLabel())) .rententionRule(String.valueOf(RententionRuleEnum.ROUND.getValue())) .cycleSetting("000000000000") .paymentCycle("0") @@ -137,7 +138,8 @@ public class SISchemeBiz extends Service { } insuranceSchemeDetailDTO.setInsuranceName(item.getInsuranceName()); insuranceSchemeDetailDTO.setRententionRule(String.valueOf(insuranceSchemeDetailPO.getRententionRule())); - insuranceSchemeDetailDTO.setPaymentScope(e.getDefaultLabel()); +// insuranceSchemeDetailDTO.setPaymentScope(e.getDefaultLabel()); + insuranceSchemeDetailDTO.setPaymentScope(SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(), e.getDefaultLabel())); } insuranceSchemeDetailDTO.setPaymentScopeValue(e.getValue()); diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java index 6ce040fed..e5f5de8b9 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java @@ -10,11 +10,13 @@ import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveTaxAgentDataDTO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; +import weaver.hrm.User; import java.util.*; import java.util.stream.Collectors; @@ -39,7 +41,8 @@ public class SalaryAcctEmployeeBO { */ public static List convert2EmployeeListDTO(List salaryAccountingEmployees, List taxAgents, - List simpleEmployees) { + List simpleEmployees, + User user) { if (CollectionUtils.isEmpty(salaryAccountingEmployees)) { return Collections.emptyList(); } @@ -56,6 +59,7 @@ public class SalaryAcctEmployeeBO { .taxAgentName(taxAgentNameMap.getOrDefault(e.getTaxAgentId(), StringUtils.EMPTY)) .build(); } + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(NumberUtils.toInt(simpleEmployee.getStatus())); return SalaryAccEmployeeListDTO.builder() .id(e.getId()) .employeeId(simpleEmployee.getEmployeeId()) @@ -64,7 +68,8 @@ public class SalaryAcctEmployeeBO { .taxAgentName(taxAgentNameMap.getOrDefault(e.getTaxAgentId(), StringUtils.EMPTY)) .departmentId(simpleEmployee.getDepartmentId()) .departmentName(simpleEmployee.getDepartmentName()) - .status(UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(simpleEmployee.getStatus()))) +// .status(UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(simpleEmployee.getStatus()))) + .status(SalaryI18nUtil.getI18nLabel(user.getLanguage(),userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())) .mobile(simpleEmployee.getMobile()) .jobNum(simpleEmployee.getWorkcode()) .hireDate(simpleEmployee.getCompanystartdate()) diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java index 97b0aa991..4a6187fdc 100644 --- a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java +++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java @@ -8,6 +8,7 @@ import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.siexport.po.AccountExportPO; import com.engine.salary.entity.siexport.po.ExcelAccountExportPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; @@ -23,7 +24,6 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static com.engine.salary.enums.UserStatusEnum.getDefaultLabelByValue; /** * @Author: sy @@ -128,7 +128,7 @@ public class InsuranceComparisonResultBO { * 构建福利核算线下对比结果 * */ - public static List> buildComparisonTableData(List accountExportPOS, List excelAccountExportPOS, Map schemeIdNameMap) { + public static List> buildComparisonTableData(List accountExportPOS, List excelAccountExportPOS, Map schemeIdNameMap, User user) { Map> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getWorkcode); // Map> acctResultMap = SalaryEntityUtil.group2Map(accountExportPOS, AccountExportPO::getWorkcode); @@ -145,6 +145,8 @@ public class InsuranceComparisonResultBO { // 记录线下值和系统值之间是否存在差异 map.put("different", "false"); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(accountExportPO.getUserStatus()); + //设置基本字段信息和类型 map.put("userName", accountExportPO.getUserName()); map.put("userName" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); @@ -154,7 +156,7 @@ public class InsuranceComparisonResultBO { map.put("mobile" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); map.put("workcode", accountExportPO.getWorkcode()); map.put("workcode" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); - map.put("employeeStatus", accountExportPO.getUserStatus() == null ? "" : getDefaultLabelByValue(accountExportPO.getUserStatus())); + map.put("employeeStatus", accountExportPO.getUserStatus() == null ? "" : SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); map.put("employeeStatus" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); map.put("socialPayOrg", paymentMap.get(accountExportPO.getSocialPayOrg()) == null ? "" : paymentMap.get(accountExportPO.getSocialPayOrg()).getName()); map.put("socialPayOrg" + DATA_TYPE_SUFFIX, SalaryDataTypeEnum.STRING.getValue()); diff --git a/src/com/engine/salary/enums/SalaryDataSourceEnum.java b/src/com/engine/salary/enums/SalaryDataSourceEnum.java index 384979bbc..f5adf5a17 100644 --- a/src/com/engine/salary/enums/SalaryDataSourceEnum.java +++ b/src/com/engine/salary/enums/SalaryDataSourceEnum.java @@ -62,16 +62,16 @@ public enum SalaryDataSourceEnum implements BaseEnum { return null; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - SalaryDataSourceEnum[] enumAry = SalaryDataSourceEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); - } - } - return ""; - } +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// SalaryDataSourceEnum[] enumAry = SalaryDataSourceEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } } diff --git a/src/com/engine/salary/enums/SalaryRoundingModeEnum.java b/src/com/engine/salary/enums/SalaryRoundingModeEnum.java index 33acca82c..9418e5a9e 100644 --- a/src/com/engine/salary/enums/SalaryRoundingModeEnum.java +++ b/src/com/engine/salary/enums/SalaryRoundingModeEnum.java @@ -1,6 +1,5 @@ package com.engine.salary.enums; - import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; @@ -35,18 +34,19 @@ public enum SalaryRoundingModeEnum implements BaseEnum { this.labelId = labelId; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - SalaryRoundingModeEnum[] enumAry = SalaryRoundingModeEnum.values(); - for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); - } - } - return ""; - } +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// SalaryRoundingModeEnum[] enumAry = SalaryRoundingModeEnum.values(); +// for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } + @Override public Integer getValue() { diff --git a/src/com/engine/salary/enums/SalaryValueTypeEnum.java b/src/com/engine/salary/enums/SalaryValueTypeEnum.java index 72c33eb1e..391803d54 100644 --- a/src/com/engine/salary/enums/SalaryValueTypeEnum.java +++ b/src/com/engine/salary/enums/SalaryValueTypeEnum.java @@ -56,16 +56,16 @@ public enum SalaryValueTypeEnum implements BaseEnum { return null; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - SalaryValueTypeEnum[] enumAry = SalaryValueTypeEnum.values(); - for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); - } - } - return ""; - } +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// SalaryValueTypeEnum[] enumAry = SalaryValueTypeEnum.values(); +// for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } } diff --git a/src/com/engine/salary/enums/UserStatusEnum.java b/src/com/engine/salary/enums/UserStatusEnum.java index c450715fc..c446402c3 100644 --- a/src/com/engine/salary/enums/UserStatusEnum.java +++ b/src/com/engine/salary/enums/UserStatusEnum.java @@ -51,9 +51,18 @@ public enum UserStatusEnum implements BaseEnum { return labelId; } - public static String getDefaultLabelByValue(Integer value) { - Optional optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst(); - return optional.isPresent() ? optional.get().defaultLabel : ""; +// public static String getDefaultLabelByValue(Integer value) { +// Optional optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst(); +// return optional.isPresent() ? optional.get().defaultLabel : ""; +// } + + public static UserStatusEnum parseByValue(Integer value) { + for (UserStatusEnum optionalAdjustReason : UserStatusEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; + } + } + return null; } public static List> getList() { diff --git a/src/com/engine/salary/enums/datacollection/AttendQuoteFieldSourceTypeEnum.java b/src/com/engine/salary/enums/datacollection/AttendQuoteFieldSourceTypeEnum.java index 1726fc9cc..8a0eccb83 100644 --- a/src/com/engine/salary/enums/datacollection/AttendQuoteFieldSourceTypeEnum.java +++ b/src/com/engine/salary/enums/datacollection/AttendQuoteFieldSourceTypeEnum.java @@ -3,6 +3,7 @@ package com.engine.salary.enums.datacollection; import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; +import java.util.Objects; /** * @Description: 考勤引用-来源 @@ -37,17 +38,26 @@ public enum AttendQuoteFieldSourceTypeEnum { return labelId; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - AttendQuoteFieldSourceTypeEnum[] enumAry = AttendQuoteFieldSourceTypeEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// AttendQuoteFieldSourceTypeEnum[] enumAry = AttendQuoteFieldSourceTypeEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } + + public static AttendQuoteFieldSourceTypeEnum parseByValue(int value) { + for (AttendQuoteFieldSourceTypeEnum optionalAdjustReason : AttendQuoteFieldSourceTypeEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; } } - return ""; + return null; } public static String getNameByValue(Integer value) { diff --git a/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java b/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java index ec36a1204..de785363c 100644 --- a/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java +++ b/src/com/engine/salary/enums/datacollection/AttendQuoteFieldTypeEnum.java @@ -3,6 +3,7 @@ package com.engine.salary.enums.datacollection; import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; +import java.util.Objects; /** * @Description: 考勤引用-来源 @@ -37,16 +38,25 @@ public enum AttendQuoteFieldTypeEnum { return labelId; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - AttendQuoteFieldTypeEnum[] enumAry = AttendQuoteFieldTypeEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// AttendQuoteFieldTypeEnum[] enumAry = AttendQuoteFieldTypeEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } + + public static AttendQuoteFieldTypeEnum parseByValue(int value) { + for (AttendQuoteFieldTypeEnum optionalAdjustReason : AttendQuoteFieldTypeEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; } } - return ""; + return null; } } diff --git a/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java b/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java index b8009d84a..9aa53a7a2 100644 --- a/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java +++ b/src/com/engine/salary/enums/datacollection/AttendQuoteSourceTypeEnum.java @@ -3,6 +3,7 @@ package com.engine.salary.enums.datacollection; import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; +import java.util.Objects; /** * @Description: 考勤引用-来源 @@ -37,16 +38,25 @@ public enum AttendQuoteSourceTypeEnum { return labelId; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - AttendQuoteSourceTypeEnum[] enumAry = AttendQuoteSourceTypeEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// AttendQuoteSourceTypeEnum[] enumAry = AttendQuoteSourceTypeEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } + + public static AttendQuoteSourceTypeEnum parseByValue(int value) { + for (AttendQuoteSourceTypeEnum optionalAdjustReason : AttendQuoteSourceTypeEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; } } - return ""; + return null; } } diff --git a/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java b/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java index 16abb7487..ababfdc01 100644 --- a/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/IndividualTaxWithholdingAgentStatusEnum.java @@ -35,16 +35,16 @@ public enum IndividualTaxWithholdingAgentStatusEnum { return labelId; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - IndividualTaxWithholdingAgentStatusEnum[] enumAry = IndividualTaxWithholdingAgentStatusEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); - } - } - return ""; - } +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// IndividualTaxWithholdingAgentStatusEnum[] enumAry = IndividualTaxWithholdingAgentStatusEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } } diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java index 9df090d39..0b45630b7 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveFieldTypeEnum.java @@ -46,10 +46,10 @@ public enum SalaryArchiveFieldTypeEnum implements BaseEnum { return this.defaultLabel; } - public static String getDefaultLabelByValue(String value, Long employeeId, String tenantKey) { - Optional optional = Arrays.stream(SalaryArchiveFieldTypeEnum.values()).filter(r->r.getValue().equals(value)).findFirst(); - return optional.isPresent()? SalaryI18nUtil.getI18nLabel(optional.get().getLabelId(), optional.get().getDefaultLabel()):""; - } +// public static String getDefaultLabelByValue(String value, Long employeeId, String tenantKey) { +// Optional optional = Arrays.stream(SalaryArchiveFieldTypeEnum.values()).filter(r->r.getValue().equals(value)).findFirst(); +// return optional.isPresent()? SalaryI18nUtil.getI18nLabel(optional.get().getLabelId(), optional.get().getDefaultLabel()):""; +// } public static String getNameByValue(String value) { Optional optional = Arrays.stream(SalaryArchiveFieldTypeEnum.values()).filter(r->r.getValue().equals(value)).findFirst(); diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java index bc239633a..b9f02fc41 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java @@ -59,10 +59,10 @@ public enum SalaryArchiveItemAdjustReasonEnum { } return ""; } - public static String getDefaultLabelByValue(String value) { - Optional optionalAdjustReason = Arrays.stream(SalaryArchiveItemAdjustReasonEnum.values()).filter(r->r.getValue().equals(value)).findFirst(); - return optionalAdjustReason.isPresent()? SalaryI18nUtil.getI18nLabel(optionalAdjustReason.get().getLabelId(), optionalAdjustReason.get().getDefaultLabel()):""; - } +// public static String getDefaultLabelByValue(String value) { +// Optional optionalAdjustReason = Arrays.stream(SalaryArchiveItemAdjustReasonEnum.values()).filter(r->r.getValue().equals(value)).findFirst(); +// return optionalAdjustReason.isPresent()? SalaryI18nUtil.getI18nLabel(optionalAdjustReason.get().getLabelId(), optionalAdjustReason.get().getDefaultLabel()):""; +// } public static SalaryArchiveItemAdjustReasonEnum parseByValue(String value) { for (SalaryArchiveItemAdjustReasonEnum optionalAdjustReason : SalaryArchiveItemAdjustReasonEnum.values()) { diff --git a/src/com/engine/salary/enums/salarybill/MessageChannelEnum.java b/src/com/engine/salary/enums/salarybill/MessageChannelEnum.java index 164d0e168..b395c9cb9 100644 --- a/src/com/engine/salary/enums/salarybill/MessageChannelEnum.java +++ b/src/com/engine/salary/enums/salarybill/MessageChannelEnum.java @@ -45,18 +45,18 @@ public enum MessageChannelEnum implements BaseEnum { return labelId; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - MessageChannelEnum[] enumAry = MessageChannelEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); - } - } - return ""; - } +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// MessageChannelEnum[] enumAry = MessageChannelEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } public static String getNameByValue(Integer value) { if (value == null) { diff --git a/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java b/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java index 262f9102c..e39faf892 100644 --- a/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java +++ b/src/com/engine/salary/enums/salarybill/SalarySendStatusEnum.java @@ -4,6 +4,7 @@ import com.engine.salary.enums.BaseEnum; import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; +import java.util.Objects; /** * @Description: 工资单开关项 @@ -43,17 +44,26 @@ public enum SalarySendStatusEnum implements BaseEnum { return labelId; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - SalarySendStatusEnum[] enumAry = SalarySendStatusEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// SalarySendStatusEnum[] enumAry = SalarySendStatusEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } + + public static SalarySendStatusEnum parseByValue(int value) { + for (SalarySendStatusEnum optionalAdjustReason : SalarySendStatusEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; } } - return ""; + return null; } public static String getNameByValue(Integer value) { diff --git a/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java b/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java index eac770878..852db34b1 100644 --- a/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java +++ b/src/com/engine/salary/enums/salaryitem/SalaryDataTypeEnum.java @@ -55,16 +55,16 @@ public enum SalaryDataTypeEnum implements BaseEnum { return null; } - public static String getDefaultLabelByValue(String value) { - if (value == null) { - return ""; - } - SalaryDataTypeEnum[] enumAry = SalaryDataTypeEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (enumAry[i].getValue().equals(value)) { - return enumAry[i].getDefaultLabel(); - } - } - return ""; - } +// public static String getDefaultLabelByValue(String value) { +// if (value == null) { +// return ""; +// } +// SalaryDataTypeEnum[] enumAry = SalaryDataTypeEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (enumAry[i].getValue().equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } } diff --git a/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java b/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java index c6c0c978c..434db3a6d 100644 --- a/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java +++ b/src/com/engine/salary/enums/salarysend/SalarySendGrantTypeEnum.java @@ -34,11 +34,11 @@ public enum SalarySendGrantTypeEnum { return labelId; } - public static String getDefaultLabelByValue(String value, Long employeeId, String tenantKey) { - return Arrays.stream(SalarySendGrantTypeEnum.values()).filter(r -> r.getValue().equals(value)).findFirst() - .map(SalarySendGrantTypeEnum::getDefaultLabel) - .orElse(StrUtil.EMPTY); - } +// public static String getDefaultLabelByValue(String value, Long employeeId, String tenantKey) { +// return Arrays.stream(SalarySendGrantTypeEnum.values()).filter(r -> r.getValue().equals(value)).findFirst() +// .map(SalarySendGrantTypeEnum::getDefaultLabel) +// .orElse(StrUtil.EMPTY); +// } public SalarySendGrantTypeEnum fromValue(String value) { for (SalarySendGrantTypeEnum salarySendGrantTypeEnum : values()) { diff --git a/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java b/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java index 92727ce4f..49159dd3e 100644 --- a/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java +++ b/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java @@ -5,6 +5,7 @@ import com.engine.salary.enums.BaseEnum; import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; +import java.util.Objects; public enum PaymentScopeEnum implements BaseEnum { SCOPE_COMPANY(1, SalaryI18nUtil.getI18nLabel(1851, "公司"), 1851), @@ -32,16 +33,25 @@ public enum PaymentScopeEnum implements BaseEnum { return this.defaultLable; } - public static String getDefaultLabelByValue(Integer value){ - if (value == null) { - return ""; - }; - PaymentScopeEnum[] enumAry = PaymentScopeEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); +// public static String getDefaultLabelByValue(Integer value){ +// if (value == null) { +// return ""; +// }; +// PaymentScopeEnum[] enumAry = PaymentScopeEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } + + public static PaymentScopeEnum parseByValue(Integer value) { + for (PaymentScopeEnum optionalAdjustReason : PaymentScopeEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; } } - return ""; + return null; } } diff --git a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java index a0ee9ee3e..4ae911624 100644 --- a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java +++ b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java @@ -49,16 +49,16 @@ public enum RententionRuleEnum implements BaseEnum { return this.defaultLabel; } - public static String getDefaultLabelByValue(Integer value) { - if (value == null) { - return ""; - } - RententionRuleEnum[] enumAry = RententionRuleEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); - } - } - return ""; - } +// public static String getDefaultLabelByValue(Integer value) { +// if (value == null) { +// return ""; +// } +// RententionRuleEnum[] enumAry = RententionRuleEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } } diff --git a/src/com/engine/salary/enums/sicategory/WelfareTypeEnum.java b/src/com/engine/salary/enums/sicategory/WelfareTypeEnum.java index 476192766..8fb36c2b7 100644 --- a/src/com/engine/salary/enums/sicategory/WelfareTypeEnum.java +++ b/src/com/engine/salary/enums/sicategory/WelfareTypeEnum.java @@ -4,6 +4,7 @@ import com.engine.salary.enums.BaseEnum; import com.engine.salary.util.SalaryI18nUtil; import java.util.Arrays; +import java.util.Objects; public enum WelfareTypeEnum implements BaseEnum { @@ -39,16 +40,26 @@ public enum WelfareTypeEnum implements BaseEnum { return this.defaultLabel; } - public static String getDefaultLabelByValue(Integer value){ - if (value == null) { - return ""; - }; - WelfareTypeEnum[] enumAry = WelfareTypeEnum.values(); - for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ - if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { - return enumAry[i].getDefaultLabel(); +// public static String getDefaultLabelByValue(Integer value){ +// if (value == null) { +// return ""; +// }; +// WelfareTypeEnum[] enumAry = WelfareTypeEnum.values(); +// for(int i = 0; i < Arrays.asList(enumAry).size(); i++){ +// if (Integer.valueOf(enumAry[i].getValue()).equals(value)) { +// return enumAry[i].getDefaultLabel(); +// } +// } +// return ""; +// } + + public static WelfareTypeEnum parseByValue(Integer value) { + for (WelfareTypeEnum optionalAdjustReason : WelfareTypeEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; } } - return ""; + return null; } + } diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java index 926faa3cb..e5f0ef27f 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java @@ -180,11 +180,13 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala Map innerEmployeeMap = simpleEmployeeList.stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, v -> v)); salaryStatisticsEmployeeListDTOs.forEach(e -> { DataCollectionEmployee simpleEmployee = innerEmployeeMap.get(e.getId()); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(Integer.parseInt(simpleEmployee.getStatus())); e.setName(Objects.isNull(simpleEmployee) ? "" : simpleEmployee.getUsername()); e.setSubCompany(simpleEmployee.getSubcompanyName()); e.setDepartment(simpleEmployee.getDepartmentName()); e.setPosition(simpleEmployee.getJobtitleName()); - e.setStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(simpleEmployee.getStatus()))); +// e.setStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(simpleEmployee.getStatus()))); + e.setStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(),userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); e.setJobNum(simpleEmployee.getWorkcode()); e.setIdNo(simpleEmployee.getIdNo()); }); diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index 4963930c9..bdb786ced 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -73,6 +73,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ list.forEach(item -> { Map record = new HashMap<>(); DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId()); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(Integer.parseInt(simpleEmployee.getStatus())); + record.put("id", item.getId()); record.put("employeeId", item.getEmployeeId()); record.put("billMonth", item.getBillMonth()); @@ -81,7 +83,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ record.put("department", simpleEmployee.getDepartmentName()); record.put("supplementaryMonth", item.getSupplementaryMonth()); record.put("mobile", simpleEmployee.getMobile()); - record.put("employeeStatus", simpleEmployee.getStatus() != null ? UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(simpleEmployee.getStatus())) : ""); +// record.put("employeeStatus", simpleEmployee.getStatus() != null ? UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(simpleEmployee.getStatus())) : ""); + record.put("employeeStatus", simpleEmployee.getStatus() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel()) : ""); ResourceFromEnum from = SalaryEnumUtil.enumMatchByValue(item.getResourceFrom(), ResourceFromEnum.values(), ResourceFromEnum.class); record.put("workcode", StringUtils.isBlank(simpleEmployee.getWorkcode()) ? "" : simpleEmployee.getWorkcode()); record.put("sourceFrom", SalaryI18nUtil.getI18nLabel(user.getLanguage(),from.getLabelId(), from.getDefaultLabel())); diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java index 5d100050d..d012fe730 100644 --- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java @@ -196,7 +196,7 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar List weaTableColumns = InsuranceComparisonResultBO.buildTableColumns4ComparisonResult(insuranceBaseSet, insurancePerPaySet, insuranceComPaySet, user); //4-通过线上线下两份数据获得对比结果 Map schemeIdNameMap = getSISchemeService(user).getSchemeIdNameMap(); - List> resultMapList = InsuranceComparisonResultBO.buildComparisonTableData(accountExportPOS, excelAccountExportPOS, schemeIdNameMap); + List> resultMapList = InsuranceComparisonResultBO.buildComparisonTableData(accountExportPOS, excelAccountExportPOS, schemeIdNameMap, user); // 系统值和线下值一致的人员 if (queryParam.isOnlyDiffEmployee()) { diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index d5d6ef3dd..c0f2dff95 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -57,7 +57,9 @@ import java.util.stream.Collectors; @Slf4j public class SIArchivesServiceImpl extends Service implements SIArchivesService { - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + private SIArchivesBiz getSiArchivesBiz(User user) { + return ServiceUtil.getService(SIArchivesBiz.class, user); + } private TaxAgentService getTaxAgentService(User user) { return ServiceUtil.getService(TaxAgentServiceImpl.class, user); @@ -112,7 +114,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public Map getPaymentForm(Map params) { Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + WelfareTypeEnum welfareTypeEnum = (WelfareTypeEnum) params.get("welfareTypeEnum"); Long employeeId = Long.valueOf(Util.null2String(params.get("employeeId"))); String schemeIdStr = Util.null2String(params.get("schemeId")); @@ -122,15 +124,14 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService schemeId = Long.valueOf(schemeIdStr); } - apidatas = siArchivesBiz.getPaymentForm(user, welfareTypeEnum, employeeId, (long) user.getUID(), schemeId, paymentOrganization); + apidatas = getSiArchivesBiz(user).getPaymentForm(user, welfareTypeEnum, employeeId, (long) user.getUID(), schemeId, paymentOrganization); return apidatas; } @Override public String insert(InsuranceArchivesSaveParam param) { - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - siArchivesBiz.insert(param, (long) user.getUID(), user); + getSiArchivesBiz(user).insert(param, (long) user.getUID(), user); return null; } @@ -172,8 +173,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - apidatas = siArchivesBiz.listPage(param, (long) user.getUID()); + + apidatas = getSiArchivesBiz(user).listPage(param, (long) user.getUID()); log.info("各操作计时 {}", sw.prettyPrint()); return apidatas; @@ -185,7 +186,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService */ private void handleHistoryData(long currentEmployeeId) { //如果触发历史数据处理,则进行一次全量增员 - if (siArchivesBiz.createOldInsuranceBaseInfo(currentEmployeeId)) { + if (getSiArchivesBiz(user).createOldInsuranceBaseInfo(currentEmployeeId)) { //批量增员 List allBaseInfoList = getInsuranceBaseInfoMapper().listAll(); @@ -471,8 +472,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public Map getSearchCondition(Map param) { Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - apidatas = siArchivesBiz.getSearchCondition(user); + apidatas = getSiArchivesBiz(user).getSearchCondition(user); return apidatas; } @@ -499,8 +499,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (insuranceArchivesEmployeePOS == null) { insuranceArchivesEmployeePOS = new ArrayList<>(); } - List> records = siArchivesBiz.buildTableData(insuranceArchivesEmployeePOS); - List columns = siArchivesBiz.buildWeaTableColumns(insuranceArchivesEmployeePOS, user.getUID()); + List> records = getSiArchivesBiz(user).buildTableData(insuranceArchivesEmployeePOS); + List columns = getSiArchivesBiz(user).buildWeaTableColumns(insuranceArchivesEmployeePOS, user.getUID()); //工作簿list List> excelSheetData = new ArrayList<>(); diff --git a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java index be21fdfe9..cf88afae7 100644 --- a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java @@ -70,7 +70,9 @@ public class SICategoryServiceImpl extends Service implements SICategoryService } List list = getICategoryMapper().listCustomInsurance(welfareType); list.stream().forEach(DTO -> { - DTO.setWelfareTypeSpan( buildWelfareType(new Integer(DTO.getWelfareType())).getDefaultLabel() ); ; + WelfareTypeEnum welfareTypeEnum = WelfareTypeEnum.parseByValue(Integer.valueOf(DTO.getWelfareType())); +// DTO.setWelfareTypeSpan( buildWelfareType(new Integer(DTO.getWelfareType())).getDefaultLabel() ); + DTO.setWelfareTypeSpan(SalaryI18nUtil.getI18nLabel(user.getLanguage(), welfareTypeEnum.getLabelId(), welfareTypeEnum.getDefaultLabel())); DTO.setPaymentScopeSpan( buildPaymentScope( DTO.getPaymentScope())); }); PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, ICategoryListDTO.class); @@ -138,17 +140,29 @@ public class SICategoryServiceImpl extends Service implements SICategoryService } private ICategoryDTO convertICategoryPO2DTO(ICategoryPO iCategoryPO){ +// return ICategoryDTO.builder().id(iCategoryPO.getId()).insuranceName(iCategoryPO.getInsuranceName()) +// .welfareType(iCategoryPO.getWelfareType()) +// .welfareTypeSpan(WelfareTypeEnum.getDefaultLabelByValue(iCategoryPO.getWelfareType())) +// .paymentScope(iCategoryPO.getPaymentScope()) +// .paymentScopeSpan(buildPaymentScope(iCategoryPO.getPaymentScope())) +// .isUse(iCategoryPO.getIsUse()).build(); + WelfareTypeEnum welfareTypeEnum = WelfareTypeEnum.parseByValue(iCategoryPO.getWelfareType()); return ICategoryDTO.builder().id(iCategoryPO.getId()).insuranceName(iCategoryPO.getInsuranceName()) .welfareType(iCategoryPO.getWelfareType()) - .welfareTypeSpan(WelfareTypeEnum.getDefaultLabelByValue(iCategoryPO.getWelfareType())) + .welfareTypeSpan(SalaryI18nUtil.getI18nLabel(user.getLanguage(),welfareTypeEnum.getLabelId(), welfareTypeEnum.getDefaultLabel())) .paymentScope(iCategoryPO.getPaymentScope()) .paymentScopeSpan(buildPaymentScope(iCategoryPO.getPaymentScope())) .isUse(iCategoryPO.getIsUse()).build(); + } private String buildPaymentScope(String paymentScope) { List paymentScopes = Arrays.asList(paymentScope.split(",")); - List collect = paymentScopes.stream().map(scope -> PaymentScopeEnum.getDefaultLabelByValue(SalaryEntityUtil.string2Integer(scope))).collect(Collectors.toList()); +// List collect = paymentScopes.stream().map(scope -> PaymentScopeEnum.getDefaultLabelByValue(SalaryEntityUtil.string2Integer(scope))).collect(Collectors.toList()); + List collect = paymentScopes.stream().map(scope -> { + PaymentScopeEnum paymentScopeEnum = PaymentScopeEnum.parseByValue(SalaryEntityUtil.string2Integer(scope)); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(),paymentScopeEnum.getLabelId(), paymentScopeEnum.getDefaultLabel()); + }).collect(Collectors.toList()); return StringUtils.join(collect, ","); } } diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index 7ed333d65..f5b17dce8 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -13,6 +13,7 @@ import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.siexport.param.InsuranceExportParam; import com.engine.salary.entity.siexport.po.AccountExportPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.siaccount.BillStatusEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.siaccount.PaymentStatusEnum; @@ -46,8 +47,6 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static com.engine.salary.enums.UserStatusEnum.getDefaultLabelByValue; - /** * @Author weaver_cl * @Description: @@ -215,6 +214,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { Map schemeIdNameMap = getSISchemeService(user).getSchemeIdNameMap(); Map paymentMap = paymentList.stream().collect(Collectors.toMap(TaxAgentPO::getId, Function.identity())); list.forEach(item -> { + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(item.getUserStatus()); + Map record = new HashMap<>(); record.put("billMonth", item.getBillMonth()); record.put("billStatus", SalaryEnumUtil.enumMatchByValue(item.getBillStatus(), BillStatusEnum.values(), BillStatusEnum.class)); @@ -223,7 +224,7 @@ public class SIExportServiceImpl extends Service implements SIExportService { record.put("supplementaryMonth", item.getSupplementaryMonth()); record.put("mobile", item.getTelephone()); record.put("workcode", item.getWorkcode()); - record.put("employeeStatus", item.getUserStatus() == null ? "" : getDefaultLabelByValue(item.getUserStatus())); + record.put("employeeStatus", item.getUserStatus() == null ? "" : SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); ResourceFromEnum from = SalaryEnumUtil.enumMatchByValue(item.getResourceFrom(), ResourceFromEnum.values(), ResourceFromEnum.class); record.put("sourceFrom", SalaryI18nUtil.getI18nLabel(user.getLanguage(),from.getLabelId(), from.getDefaultLabel())); diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index faaea9525..25c2c087e 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -280,6 +280,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { InsuranceArchivesSocialSchemePO socialItem = socialSchemePOMap.get(item.getPaymentOrganization() + "-" + item.getEmployeeId()); InsuranceArchivesFundSchemePO fundItem = fundSchemePOMap.get(item.getPaymentOrganization() + "-" + item.getEmployeeId()); InsuranceArchivesOtherSchemePO otherItem = otherSchemePOMap.get(item.getPaymentOrganization() + "-" + item.getEmployeeId()); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(item.getUserStatus()); Map map = new HashMap<>(); map.put("employeeName", item.getUserName()); map.put("employeeId", item.getEmployeeId()); @@ -288,7 +289,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { map.put("jobNum", item.getJobNum()); map.put("paymentOrganizationName", longTaxAgentPOMap.get(item.getPaymentOrganization()) != null ? longTaxAgentPOMap.get(item.getPaymentOrganization()).getName() : ""); map.put("mobile", item.getTelephone()); - map.put("status", item.getUserStatus() == null ? "" : UserStatusEnum.getDefaultLabelByValue(item.getUserStatus())); +// map.put("status", item.getUserStatus() == null ? "" : UserStatusEnum.getDefaultLabelByValue(item.getUserStatus())); + map.put("status", item.getUserStatus() == null ? "" : SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); if (socialItem != null) { map.put("socialName", getSiSchemeService().querySchemeName(socialItem.getSocialSchemeId())); Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 8805e6885..9dc8832b7 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -256,7 +256,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc List taxAgentIds = tempList.stream().map(SalaryAcctEmployeePO::getTaxAgentId).distinct().collect(Collectors.toList()); List taxAgents = getTaxAgentService(user).listByIds(taxAgentIds); // 转换成列表数据 - salaryAccEmployeeListDTOS.addAll(SalaryAcctEmployeeBO.convert2EmployeeListDTO(tempList, taxAgents, simpleEmployees)); + salaryAccEmployeeListDTOS.addAll(SalaryAcctEmployeeBO.convert2EmployeeListDTO(tempList, taxAgents, simpleEmployees, user)); } List> rows = Lists.newArrayListWithExpectedSize(salaryAccEmployeeListDTOS.size()); for (SalaryAccEmployeeListDTO dto : salaryAccEmployeeListDTOS) { diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java index 3368b50ee..48529d267 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java @@ -611,9 +611,13 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi } Optional optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst(); m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : ""); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(Integer.parseInt(m.getEmployeeStatus())); +// m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); + m.setEmployeeStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); - m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); - m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + SalaryArchiveItemAdjustReasonEnum salaryArchiveItemAdjustReasonEnum = SalaryArchiveItemAdjustReasonEnum.parseByValue(m.getAdjustReason()); +// m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + m.setAdjustReason(SalaryI18nUtil.getI18nLabel(user.getLanguage(), salaryArchiveItemAdjustReasonEnum.getLabelId(), salaryArchiveItemAdjustReasonEnum.getDefaultLabel())); }); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List> rows = new ArrayList<>(); diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index e14049546..746e1bbe8 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -419,7 +419,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 3.组装数据 List> listMaps = new ArrayList<>(); salaryArchives.forEach(e -> { - e.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(e.getEmployeeStatus()))); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(Integer.parseInt(e.getEmployeeStatus())); +// e.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(e.getEmployeeStatus()))); + e.setEmployeeStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); Map map = new LinkedHashMap<>(); map.put("id", e.getId()); diff --git a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java index 637d9cb96..7131e2771 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java @@ -225,7 +225,10 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA Optional optionalAfter = taxAgentList.stream().filter(t -> t.getId().toString().equals(m.getAdjustAfter())).findFirst(); m.setAdjustAfter(optionalAfter.isPresent() ? optionalAfter.get().getName() : ""); - m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(Integer.parseInt(m.getEmployeeStatus())); +// m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); + m.setEmployeeStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); + SalaryArchiveTaxAgentAdjustReasonEnum salaryArchiveTaxAgentAdjustReasonEnum = SalaryArchiveTaxAgentAdjustReasonEnum.parseByValue(m.getAdjustReason()); m.setAdjustReason(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryArchiveTaxAgentAdjustReasonEnum.getLabelId(), salaryArchiveTaxAgentAdjustReasonEnum.getValue())); }); diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index f62e6dc3b..abb56980a 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -1312,10 +1312,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService queryParam.setOrderRule(orderRule); List list = salarySendInfoMapper.list(queryParam); list.forEach(e -> { + SalarySendStatusEnum salarySendStatusEnum = SalarySendStatusEnum.parseByValue(Integer.parseInt(e.getSendStatus())); // 发放状态 - e.setSendStatus(SalarySendStatusEnum.getDefaultLabelByValue(Integer.valueOf(e.getSendStatus()))); +// e.setSendStatus(SalarySendStatusEnum.getDefaultLabelByValue(Integer.valueOf(e.getSendStatus()))); + e.setSendStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salarySendStatusEnum.getLabelId(), salarySendStatusEnum.getDefaultLabel())); }); + // 3.添加行记录 // 3.表数据 for (SalarySendInfoListDTO dto : list) { diff --git a/src/com/engine/salary/transmethod/TransMethod.java b/src/com/engine/salary/transmethod/TransMethod.java index 373d81fa4..adb8d6cbd 100644 --- a/src/com/engine/salary/transmethod/TransMethod.java +++ b/src/com/engine/salary/transmethod/TransMethod.java @@ -51,8 +51,9 @@ public class TransMethod { * @param sourceType * @return */ - public static String fieldSourceType(String sourceType) { - return AttendQuoteFieldSourceTypeEnum.getDefaultLabelByValue(Integer.valueOf(sourceType)); + public static String fieldSourceType(String sourceType, User user) { + AttendQuoteFieldSourceTypeEnum attendQuoteFieldSourceTypeEnum = AttendQuoteFieldSourceTypeEnum.parseByValue(Integer.parseInt(sourceType)); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(), attendQuoteFieldSourceTypeEnum.getLabelId(), attendQuoteFieldSourceTypeEnum.getDefaultLabel()); } /** @@ -61,8 +62,9 @@ public class TransMethod { * @param sourceType * @return */ - public static String fieldType(String sourceType) { - return AttendQuoteFieldTypeEnum.getDefaultLabelByValue(Integer.valueOf(sourceType)); + public static String fieldType(String sourceType, User user) { + AttendQuoteFieldTypeEnum attendQuoteFieldTypeEnum = AttendQuoteFieldTypeEnum.parseByValue(Integer.parseInt(sourceType)); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(), attendQuoteFieldTypeEnum.getLabelId(), attendQuoteFieldTypeEnum.getDefaultLabel()); } /** @@ -71,8 +73,9 @@ public class TransMethod { * @param sourceType * @return */ - public static String sourceType(String sourceType) { - return AttendQuoteSourceTypeEnum.getDefaultLabelByValue(Integer.valueOf(sourceType)); + public static String sourceType(String sourceType, User user) { + AttendQuoteSourceTypeEnum attendQuoteSourceTypeEnum = AttendQuoteSourceTypeEnum.parseByValue(Integer.parseInt(sourceType)); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(), attendQuoteSourceTypeEnum.getLabelId(), attendQuoteSourceTypeEnum.getDefaultLabel()); } /** @@ -81,8 +84,9 @@ public class TransMethod { * @param roundingMode * @return */ - public static String roundingMode(String roundingMode) { - return SalaryRoundingModeEnum.getDefaultLabelByValue(Integer.valueOf(roundingMode)); + public static String roundingMode(String roundingMode, User user) { + SalaryRoundingModeEnum salaryRoundingModeEnum = SalaryRoundingModeEnum.parseByValue(Integer.parseInt(roundingMode)); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(), salaryRoundingModeEnum.getLabelId(), salaryRoundingModeEnum.getDefaultLabel()); } /** @@ -90,16 +94,18 @@ public class TransMethod { * @param datasource * @return */ - public static String datasource(String datasource) { - return SalaryValueTypeEnum.getDefaultLabelByValue(Integer.valueOf(datasource)); + public static String datasource(String datasource, User user) { + SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(Integer.parseInt(datasource)); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(), salaryValueTypeEnum.getLabelId(), salaryValueTypeEnum.getDefaultLabel()); } /** * 字段类型 * @return */ - public static String dataType(String dataType) { - return SalaryDataTypeEnum.getDefaultLabelByValue(dataType); + public static String dataType(String dataType, User user) { + SalaryDataTypeEnum salaryDataTypeEnum = SalaryDataTypeEnum.parseByValue(dataType); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryDataTypeEnum.getLabelId(), salaryDataTypeEnum.getDefaultLabel()); } public static String buildSalaryCycle(String salaryCycle,String salaryCycleFromDay, User user) { diff --git a/src/com/engine/salary/wrapper/AttendQuoteFieldWrapper.java b/src/com/engine/salary/wrapper/AttendQuoteFieldWrapper.java index ddfdc687e..edf6e3178 100644 --- a/src/com/engine/salary/wrapper/AttendQuoteFieldWrapper.java +++ b/src/com/engine/salary/wrapper/AttendQuoteFieldWrapper.java @@ -55,9 +55,14 @@ public class AttendQuoteFieldWrapper extends Service { List list = page.getList(); list.forEach(m->{ Integer sourceType = Integer.valueOf(m.getSourceType()); - m.setSourceType(AttendQuoteFieldSourceTypeEnum.getDefaultLabelByValue(sourceType)); + AttendQuoteFieldSourceTypeEnum attendQuoteFieldSourceTypeEnum = AttendQuoteFieldSourceTypeEnum.parseByValue(sourceType); +// m.setSourceType(AttendQuoteFieldSourceTypeEnum.getDefaultLabelByValue(sourceType)); + m.setSourceType(SalaryI18nUtil.getI18nLabel(user.getLanguage(), attendQuoteFieldSourceTypeEnum.getLabelId(), attendQuoteFieldSourceTypeEnum.getDefaultLabel())); m.setSourceTypeValue(AttendQuoteFieldSourceTypeEnum.getNameByValue(sourceType)); - m.setFieldType(AttendQuoteFieldTypeEnum.getDefaultLabelByValue(Integer.valueOf(m.getFieldType()))); + + AttendQuoteFieldTypeEnum attendQuoteFieldTypeEnum = AttendQuoteFieldTypeEnum.parseByValue(Integer.parseInt(m.getFieldType())); +// m.setFieldType(AttendQuoteFieldTypeEnum.getDefaultLabelByValue(Integer.valueOf(m.getFieldType()))); + m.setFieldType(SalaryI18nUtil.getI18nLabel(user.getLanguage(), attendQuoteFieldTypeEnum.getLabelId(), attendQuoteFieldTypeEnum.getDefaultLabel())); }); page.setList(list); diff --git a/src/com/engine/salary/wrapper/AttendQuoteWrapper.java b/src/com/engine/salary/wrapper/AttendQuoteWrapper.java index b7e35f586..effc36f92 100644 --- a/src/com/engine/salary/wrapper/AttendQuoteWrapper.java +++ b/src/com/engine/salary/wrapper/AttendQuoteWrapper.java @@ -15,6 +15,7 @@ import com.engine.salary.service.SalarySobService; import com.engine.salary.service.impl.AttendQuoteServiceImpl; import com.engine.salary.service.impl.SalarySobServiceImpl; import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.valid.ValidUtil; import org.apache.commons.collections4.CollectionUtils; @@ -58,7 +59,11 @@ public class AttendQuoteWrapper extends Service { List list = page.getList(); if (CollectionUtils.isNotEmpty(list)) { - list.forEach(m -> m.setSourceType(AttendQuoteSourceTypeEnum.getDefaultLabelByValue(Integer.valueOf(m.getSourceType())))); +// list.forEach(m -> m.setSourceType(AttendQuoteSourceTypeEnum.getDefaultLabelByValue(Integer.valueOf(m.getSourceType())))); + list.forEach(m -> { + AttendQuoteSourceTypeEnum attendQuoteSourceTypeEnum = AttendQuoteSourceTypeEnum.parseByValue(Integer.parseInt(m.getSourceType())); + m.setSourceType(SalaryI18nUtil.getI18nLabel(user.getLanguage(), attendQuoteSourceTypeEnum.getLabelId(), attendQuoteSourceTypeEnum.getDefaultLabel())); + }); page.setList(list); } diff --git a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java index b70310b0d..318b7938c 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java @@ -112,7 +112,7 @@ public class SalaryAcctEmployeeWrapper extends Service { List taxAgentIds = list.stream().map(SalaryAcctEmployeePO::getTaxAgentId).collect(Collectors.toList()); List taxAgentPOS = getTaxAgentService(user).listByIds(taxAgentIds); // 转换成列表dto - List salaryAccEmployeeListDTOS = SalaryAcctEmployeeBO.convert2EmployeeListDTO(list, taxAgentPOS, simpleEmployees); + List salaryAccEmployeeListDTOS = SalaryAcctEmployeeBO.convert2EmployeeListDTO(list, taxAgentPOS, simpleEmployees, user); PageInfo pageInfo = new PageInfo(salaryAccEmployeeListDTOS, SalaryAccEmployeeListDTO.class); pageInfo.setTotal(page.getTotal()); pageInfo.setPageSize(page.getPageSize()); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index ac4005687..843ff5e40 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -228,8 +228,13 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt Optional optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst(); m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : ""); - m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); - m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(Integer.parseInt(m.getEmployeeStatus())); +// m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); + m.setEmployeeStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(),userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); + + SalaryArchiveItemAdjustReasonEnum salaryArchiveItemAdjustReasonEnum = SalaryArchiveItemAdjustReasonEnum.parseByValue(m.getAdjustReason()); +// m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + m.setAdjustReason(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryArchiveItemAdjustReasonEnum.getLabelId(), salaryArchiveItemAdjustReasonEnum.getDefaultLabel())); }); return list; @@ -271,7 +276,9 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt .findFirst(); m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : ""); - m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + SalaryArchiveItemAdjustReasonEnum salaryArchiveItemAdjustReasonEnum = SalaryArchiveItemAdjustReasonEnum.parseByValue(m.getAdjustReason()); +// m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + m.setAdjustReason(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryArchiveItemAdjustReasonEnum.getLabelId(), salaryArchiveItemAdjustReasonEnum.getDefaultLabel())); SingleSalaryItemAdjustRecordListDTO singleSalaryItemAdjustRecordList = new SingleSalaryItemAdjustRecordListDTO(); BeanUtils.copyProperties(m, singleSalaryItemAdjustRecordList); @@ -353,7 +360,9 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt Optional optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst(); m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : ""); - m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + SalaryArchiveItemAdjustReasonEnum salaryArchiveItemAdjustReasonEnum = SalaryArchiveItemAdjustReasonEnum.parseByValue(m.getAdjustReason()); +// m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); + m.setAdjustReason(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryArchiveItemAdjustReasonEnum.getLabelId(), salaryArchiveItemAdjustReasonEnum.getDefaultLabel())); SingleSalaryItemAdjustRecordListDTO singleSalaryItemAdjustRecordList = new SingleSalaryItemAdjustRecordListDTO(); BeanUtils.copyProperties(m, singleSalaryItemAdjustRecordList); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java index d13bad08d..2263110c7 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java @@ -182,7 +182,9 @@ public class SalaryArchiveTaxAgentWrapper extends Service { Optional optionalAfter = taxAgentList.stream().filter(t -> t.getId().toString().equals(m.getAdjustAfter())).findFirst(); m.setAdjustAfter(optionalAfter.isPresent() ? optionalAfter.get().getName() : ""); - m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); + UserStatusEnum userStatusEnum = UserStatusEnum.parseByValue(Integer.parseInt(m.getEmployeeStatus())); +// m.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(m.getEmployeeStatus()))); + m.setEmployeeStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(), userStatusEnum.getLabelId(), userStatusEnum.getDefaultLabel())); SalaryArchiveTaxAgentAdjustReasonEnum salaryArchiveTaxAgentAdjustReasonEnum = SalaryArchiveTaxAgentAdjustReasonEnum.parseByValue(m.getAdjustReason()); m.setAdjustReason(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryArchiveTaxAgentAdjustReasonEnum.getLabelId(), salaryArchiveTaxAgentAdjustReasonEnum.getValue()));