From 68bcfeb2c62219bc7757e0bf80c1c1fea8703c82 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 6 Jul 2023 16:52:08 +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=EF=BC=8C=E6=96=87=E5=AD=97=E8=BD=AC=E4=B9=89?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A5=E5=8F=8A=E5=AF=BC=E5=87=BAexcel?= =?UTF-8?q?=E5=88=97=E5=AE=BD=E8=AE=BE=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SISchemeBiz.java | 4 ++-- .../cmd/sicategory/SICategoryGetFormCmd.java | 6 +++--- .../salary/enums/salarysob/TargetTypeEnum.java | 4 ++++ .../enums/sicategory/PaymentScopeEnum.java | 2 +- .../enums/sicategory/UndertakerEnum.java | 2 +- .../salary/report/enums/PaymentScopeEnum.java | 2 +- .../service/impl/SIAccountServiceImpl.java | 10 +++++----- .../service/impl/SIRepairServiceImpl.java | 18 +++++++++--------- .../impl/TaxAgentManageRangeServiceImpl.java | 7 ++++++- .../transmethod/ICategoryTransMethod.java | 4 ++-- src/com/engine/salary/util/SalaryEnumUtil.java | 11 ++++++++--- .../salary/util/excel/ExcelUtilPlus.java | 9 ++++++--- .../salary/web/SalaryCommonController.java | 7 ++++++- .../engine/salary/wrapper/TaxAgentWrapper.java | 18 ++++++++++++++++-- 14 files changed, 70 insertions(+), 34 deletions(-) diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java index 1bf133d80..473fb7040 100644 --- a/src/com/engine/salary/biz/SISchemeBiz.java +++ b/src/com/engine/salary/biz/SISchemeBiz.java @@ -81,7 +81,7 @@ public class SISchemeBiz extends Service { .insuranceId(item.getId()) .insuranceName(item.getInsuranceName()) // .paymentScope(e.getDefaultLabel()) - .paymentScope(SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(), e.getDefaultLabel())) + .paymentScope(SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(), e.getDefaultLabel()).replace(" ", "")) .rententionRule(String.valueOf(RententionRuleEnum.ROUND.getValue())) .cycleSetting("000000000000") .paymentCycle("0") @@ -139,7 +139,7 @@ public class SISchemeBiz extends Service { insuranceSchemeDetailDTO.setInsuranceName(item.getInsuranceName()); insuranceSchemeDetailDTO.setRententionRule(String.valueOf(insuranceSchemeDetailPO.getRententionRule())); // insuranceSchemeDetailDTO.setPaymentScope(e.getDefaultLabel()); - insuranceSchemeDetailDTO.setPaymentScope(SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(), e.getDefaultLabel())); + insuranceSchemeDetailDTO.setPaymentScope(SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(), e.getDefaultLabel()).replace(" ", "")); } insuranceSchemeDetailDTO.setPaymentScopeValue(e.getValue()); diff --git a/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java b/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java index 12e5a21e6..9bf08c70f 100644 --- a/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java +++ b/src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java @@ -47,7 +47,7 @@ public class SICategoryGetFormCmd extends AbstractCommonCommand checkOptions = new ArrayList <>(); - checkOptions.add(new SearchConditionOption("SCOPE_COMPANY",SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司"))); + checkOptions.add(new SearchConditionOption("SCOPE_COMPANY",SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司"))); checkOptions.add(new SearchConditionOption("SCOPE_PERSON", SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"))); checkbox.setColSpan(2); checkbox.setFieldcol(12); @@ -77,7 +77,7 @@ public class SICategoryGetFormCmd extends AbstractCommonCommand { }).collect(Collectors.toList()); } + public static List getEffectiveList() { + return Arrays.stream(TargetTypeEnum.values()).filter(v -> v != ALL).collect(Collectors.toList()); + } + public static TargetTypeEnum parseByValue(Integer value) { for (TargetTypeEnum targetTypeEnum : TargetTypeEnum.values()) { if (Objects.equals(targetTypeEnum.getValue(), value)) { diff --git a/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java b/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java index 49159dd3e..72de17e56 100644 --- a/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java +++ b/src/com/engine/salary/enums/sicategory/PaymentScopeEnum.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.Objects; public enum PaymentScopeEnum implements BaseEnum { - SCOPE_COMPANY(1, SalaryI18nUtil.getI18nLabel(1851, "公司"), 1851), + SCOPE_COMPANY(1, SalaryI18nUtil.getI18nLabel(388108, "公司"), 388108), SCOPE_PERSON(2, SalaryI18nUtil.getI18nLabel(500201, "个人"), 500201); private Integer value; diff --git a/src/com/engine/salary/enums/sicategory/UndertakerEnum.java b/src/com/engine/salary/enums/sicategory/UndertakerEnum.java index 474e188d3..64c8009ac 100644 --- a/src/com/engine/salary/enums/sicategory/UndertakerEnum.java +++ b/src/com/engine/salary/enums/sicategory/UndertakerEnum.java @@ -11,7 +11,7 @@ import com.engine.salary.util.SalaryI18nUtil; */ public enum UndertakerEnum implements BaseEnum { - SCOPE_COMPANY(1, SalaryI18nUtil.getI18nLabel(1851, "公司"), 1851), + SCOPE_COMPANY(1, SalaryI18nUtil.getI18nLabel(388108, "公司"), 388108), SCOPE_PERSON(2, SalaryI18nUtil.getI18nLabel(500201, "个人"), 500201); private Integer value; diff --git a/src/com/engine/salary/report/enums/PaymentScopeEnum.java b/src/com/engine/salary/report/enums/PaymentScopeEnum.java index 997327dd9..15bb78077 100644 --- a/src/com/engine/salary/report/enums/PaymentScopeEnum.java +++ b/src/com/engine/salary/report/enums/PaymentScopeEnum.java @@ -3,7 +3,7 @@ package com.engine.salary.report.enums; import com.engine.salary.util.SalaryI18nUtil; public enum PaymentScopeEnum { - SCOPE_COMPANY(1, SalaryI18nUtil.getI18nLabel(1851, "公司"), 1851), + SCOPE_COMPANY(1, SalaryI18nUtil.getI18nLabel(388108, "公司"), 388108), SCOPE_PERSON(2, SalaryI18nUtil.getI18nLabel(500201, "个人"), 500201); private Integer value; diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 3bea291b7..dcace0b7f 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2525,11 +2525,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List addGroups = new ArrayList<>(); getPaymentGroup(socialPerJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),538967, "社保"), dataMap, addGroups); - getPaymentGroup(socialComJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),538967, "社保"), dataMap, addGroups); + getPaymentGroup(socialComJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),538967, "社保"), dataMap, addGroups); getPaymentGroup(fundPerJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),538969, "公积金"), dataMap, addGroups); - getPaymentGroup(fundComJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),538969, "公积金"), dataMap, addGroups); + getPaymentGroup(fundComJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),538969, "公积金"), dataMap, addGroups); getPaymentGroup(otherPerJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),542460, "其他福利"), dataMap, addGroups); - getPaymentGroup(otherComJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),542460, "其他福利"), dataMap, addGroups); + getPaymentGroup(otherComJson, SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),542460, "其他福利"), dataMap, addGroups); Map resultMap = new HashMap<>(); // resultMap.put("data", dataMap); @@ -2556,9 +2556,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { perList.add(map); } - } else if (group.getTitle().contains(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司"))) { + } else if (group.getTitle().contains(SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司"))) { map.put("title", group.getTitle()); - map.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + map.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); map.put("insuranceName", item.getLabel()); map.put("insuranceId", insuranceId); map.put("insuranceValue", dataMap.get(domkey[0])); diff --git a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java index 660c2ab72..0a1673859 100644 --- a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java @@ -233,7 +233,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -258,7 +258,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -283,7 +283,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -311,7 +311,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -342,7 +342,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -374,7 +374,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -405,7 +405,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -433,7 +433,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); @@ -461,7 +461,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); - comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司")); + comMap.put("paymentScope", SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司")); resultList.add(perMap); resultList.add(comMap); diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index e0b4a3c2c..953a585a9 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -245,7 +245,12 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM PageInfo dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxAgentManageRangeListDTO.class); // 查询人员状态 // List hrmStatusList = hrmCommonHrmStatusService.list(); - List hrmStatusList = UserStatusEnum.getHrmStatusList(); +// List hrmStatusList = UserStatusEnum.getHrmStatusList(); + List userStatusEnumList = UserStatusEnum.getEffectiveList(); + List hrmStatusList = new ArrayList<>(); + userStatusEnumList.forEach(f -> { + hrmStatusList.add(HrmStatus.builder().id(f.getValue().toString()).name(SalaryI18nUtil.getI18nLabel(user.getLanguage(),f.getLabelId(), f.getDefaultLabel())).build()); + }); // 薪资账套的人员范围po转换成列表dto List taxAgentManageRangeList = TaxAgentBO.convert2ListDTO(taxAgentManageRanges, employeeComInfos, departmentComInfos, subDepartmentComInfos, positionComInfos, hrmStatusList, user); // 根据对象名称过滤 diff --git a/src/com/engine/salary/transmethod/ICategoryTransMethod.java b/src/com/engine/salary/transmethod/ICategoryTransMethod.java index ba6f1ddea..c47dcc6bc 100644 --- a/src/com/engine/salary/transmethod/ICategoryTransMethod.java +++ b/src/com/engine/salary/transmethod/ICategoryTransMethod.java @@ -28,12 +28,12 @@ public class ICategoryTransMethod { public static String getPaymentcopeTypeName(String type, User user) { switch (type) { case "1": - return SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司"); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司"); case "2": return SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"); case "1,2": case "2,1": - return SalaryI18nUtil.getI18nLabel(user.getLanguage(),1851, "公司") + "," + SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"); + return SalaryI18nUtil.getI18nLabel(user.getLanguage(),388108, "公司") + "," + SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"); default: return ""; } diff --git a/src/com/engine/salary/util/SalaryEnumUtil.java b/src/com/engine/salary/util/SalaryEnumUtil.java index c000e351b..db1eaa051 100644 --- a/src/com/engine/salary/util/SalaryEnumUtil.java +++ b/src/com/engine/salary/util/SalaryEnumUtil.java @@ -58,12 +58,14 @@ public class SalaryEnumUtil { /** * 获取枚举下拉列表 - * @param enumName 枚举路径，列如：com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum + * @param infoMap enumName 枚举路径，列如：com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum * @return */ - public static List> enumSelectList(String enumName) { + public static List> enumSelectList(Map infoMap) { try { + String enumName = infoMap.get("enumClass").toString(); + User user = (User) infoMap.get("user"); List> keyValueList = new ArrayList>(); Class cls = Class.forName(enumName); @@ -75,7 +77,10 @@ public class SalaryEnumUtil { for (BaseEnum enumMessage : enums) { Map hashMap = new HashMap(); hashMap.put("value", enumMessage.getValue()); - hashMap.put("defaultLabel", enumMessage.getDefaultLabel()); +// hashMap.put("defaultLabel", enumMessage.getDefaultLabel()); + hashMap.put("defaultLabel", SalaryI18nUtil.getI18nLabel(user.getLanguage(), enumMessage.getLabelId(), enumMessage.getDefaultLabel()).equals("null ") + ? enumMessage.getDefaultLabel() + : SalaryI18nUtil.getI18nLabel(user.getLanguage(), enumMessage.getLabelId(), enumMessage.getDefaultLabel())); hashMap.put("labelId", enumMessage.getLabelId()); keyValueList.add(hashMap); diff --git a/src/com/engine/salary/util/excel/ExcelUtilPlus.java b/src/com/engine/salary/util/excel/ExcelUtilPlus.java index f8cb09c79..f82c08e10 100644 --- a/src/com/engine/salary/util/excel/ExcelUtilPlus.java +++ b/src/com/engine/salary/util/excel/ExcelUtilPlus.java @@ -109,7 +109,8 @@ public class ExcelUtilPlus { //遍历设置列宽 List header = rowList.get(0); for (int i = 0; i < header.size(); i++) { - sheet.setColumnWidth(i,Math.max(12, header.get(i).toString().length()*4)*256); +// sheet.setColumnWidth(i,Math.max(12, header.get(i).toString().length()*4)*256); + sheet.setColumnWidth(i,Math.min(80, Math.max(12, getStrlength(header.get(i).toString())*4))*256); } for (int rowIndex = 0; rowIndex < rowList.size(); rowIndex++) { @@ -193,7 +194,8 @@ public class ExcelUtilPlus { //遍历设置列宽 List header = rowList.get(0); for (int i = 0; i < header.size(); i++) { - sheet.setColumnWidth(i,Math.max(12, header.get(i).toString().length()*4)*256); +// sheet.setColumnWidth(i,Math.max(12, header.get(i).toString().length()*4)*256); + sheet.setColumnWidth(i,Math.min(80, Math.max(12, getStrlength(header.get(i).toString())*4))*256); } for (int rowIndex = 0; rowIndex < rowList.size(); rowIndex++) { @@ -298,7 +300,8 @@ public class ExcelUtilPlus { //遍历设置列宽 List header = rowList.get(0); for (int i = 0; i < header.size(); i++) { - sheet.setColumnWidth(i,Math.max(12, header.get(i).toString().length()*4)*256); +// sheet.setColumnWidth(i,Math.max(12, header.get(i).toString().length()*4)*256); + sheet.setColumnWidth(i,Math.min(80, Math.max(12, getStrlength(header.get(i).toString())*4))*256); } for (int rowIndex = 0; rowIndex < rowList.size(); rowIndex++) { diff --git a/src/com/engine/salary/web/SalaryCommonController.java b/src/com/engine/salary/web/SalaryCommonController.java index ca7a439dc..7114fab4f 100644 --- a/src/com/engine/salary/web/SalaryCommonController.java +++ b/src/com/engine/salary/web/SalaryCommonController.java @@ -16,6 +16,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,7 +32,11 @@ public class SalaryCommonController { @Produces(MediaType.APPLICATION_JSON) public String getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "enumClass") String enumClass) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>>(user).run(SalaryEnumUtil::enumSelectList, enumClass); + Map infoMap = new HashMap(); + infoMap.put("enumClass", enumClass); + infoMap.put("user", user); +// return new ResponseResult>>(user).run(SalaryEnumUtil::enumSelectList, enumClass); + return new ResponseResult>>(user).run(SalaryEnumUtil::enumSelectList, infoMap); } diff --git a/src/com/engine/salary/wrapper/TaxAgentWrapper.java b/src/com/engine/salary/wrapper/TaxAgentWrapper.java index 6ca009a57..efe3c7f5e 100644 --- a/src/com/engine/salary/wrapper/TaxAgentWrapper.java +++ b/src/com/engine/salary/wrapper/TaxAgentWrapper.java @@ -330,9 +330,23 @@ public class TaxAgentWrapper extends Service { */ public TaxAgentManageRangeFormDTO getRangeFrom() { // 查询人员状态 - List hrmStatusList = UserStatusEnum.getHrmStatusList(); +// List hrmStatusList = UserStatusEnum.getHrmStatusList(); + List userStatusEnumList = UserStatusEnum.getEffectiveList(); + List hrmStatusList = new ArrayList<>(); + userStatusEnumList.forEach(f -> { + hrmStatusList.add(HrmStatus.builder().id(f.getValue().toString()).name(SalaryI18nUtil.getI18nLabel(user.getLanguage(),f.getLabelId(), f.getDefaultLabel())).build()); + }); //人员类型下拉列表 - List> selectList = TargetTypeEnum.getSelectList(); +// List> selectList = TargetTypeEnum.getSelectList(); + List targetTypeEnumList = TargetTypeEnum.getEffectiveList(); + List> selectList = new ArrayList<>(); + targetTypeEnumList.forEach(f -> { + Map map = new HashMap<>(); + map.put("id", f.name()); + map.put("name", SalaryI18nUtil.getI18nLabel(user.getLanguage(),f.getLabelId(), f.getDefaultLabel())); + map.put("value", f.getValue()); + selectList.add(map); + }); return TaxAgentManageRangeFormDTO.builder().employeeStatus(hrmStatusList).targetTypeList(selectList).build(); }