From 7a2366a112fa935bb3fec8de8902b5dd9b722fcd Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 14 Dec 2023 16:23:13 +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=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=BC=96=E8=BE=91=E6=9A=82=E6=97=B6=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryBill/bo/SalaryBillItemNameBO.java | 3 ++- .../bo/SalarySobItemAggregateBO.java | 2 ++ .../service/impl/SalarySendServiceImpl.java | 11 +++++----- .../salary/wrapper/SalaryTemplateWrapper.java | 22 ++++++++++--------- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java index 4ad320496..41927021f 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java @@ -24,7 +24,8 @@ public class SalaryBillItemNameBO { return SalaryBillItemNamePOList.stream() .map(po -> SalaryBillItemNameDTO.builder() .salaryItemId(po.getSalaryItemId()) - .salaryItemShowName("base64_" + Base64Encoder.encode(po.getSalaryItemShowName())) + .salaryItemShowName(po.getSalaryItemShowName()) +// .salaryItemShowName("base64_" + Base64Encoder.encode(po.getSalaryItemShowName())) .build()) .collect(Collectors.toList()); } diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java index 9682888be..a0724a91c 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java @@ -278,6 +278,7 @@ public class SalarySobItemAggregateBO { // name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName(); //20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name name = Util.formatMultiLang(salaryItemPO.getName(), String.valueOf(user.getLanguage())); +// name = "base64_" + Base64Encoder.encode(salaryItemPO.getName()); Integer valueType = Optional.ofNullable(salarySobItemPO.getValueType()).orElse(salaryItemPO.getValueType()); items.add(SalarySobItemDTO.builder() @@ -336,6 +337,7 @@ public class SalarySobItemAggregateBO { // name = salaryItem.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItem.getLabelId(),salaryItem.getName()) : salaryItem.getName(); //20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name name = Util.formatMultiLang(salaryItem.getName(), String.valueOf(user.getLanguage())); +// name = "base64_" + Base64Encoder.encode(salaryItem.getName()); return SalarySobItemDTO.builder() .id(salarySobBackItem.getId()) .salarySobId(salarySob.getId()) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 716e76571..b6b9c6478 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -605,14 +605,15 @@ public class SalarySendServiceImpl extends Service implements SalarySendService } for (SalaryTemplateSalaryItemSetListDTO setListDTO : itemSetListDTOS) { if (StringUtils.isNotBlank(groupNameMap.get(setListDTO.getGroupId()))) { -// setListDTO.setGroupName(groupNameMap.get(setListDTO.getGroupId())); - setListDTO.setGroupName(Util.formatMultiLang(setListDTO.getGroupName(), String.valueOf(user.getLanguage()))); + setListDTO.setGroupName(groupNameMap.get(setListDTO.getGroupId())); +// setListDTO.setGroupName(Util.formatMultiLang(setListDTO.getGroupName(), String.valueOf(user.getLanguage()))); } for (SalaryTemplateSalaryItemListDTO dto : setListDTO.getItems()) { if (salaryIdNameMap.get(dto.getSalaryItemId()) != null) { -// dto.setName(salaryIdNameMap.get(dto.getSalaryItemId())); - dto.setName(Util.formatMultiLang(dto.getName(), String.valueOf(user.getLanguage()))); - dto.setSalaryItemShowName(Util.formatMultiLang(dto.getSalaryItemShowName(), String.valueOf(user.getLanguage()))); + dto.setName(salaryIdNameMap.get(dto.getSalaryItemId())); + dto.setSalaryItemShowName(salaryIdNameMap.get(dto.getSalaryItemId())); +// dto.setName(Util.formatMultiLang(dto.getName(), String.valueOf(user.getLanguage()))); +// dto.setSalaryItemShowName(Util.formatMultiLang(dto.getSalaryItemShowName(), String.valueOf(user.getLanguage()))); } } } diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 746df694d..01d07b965 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -346,14 +346,16 @@ public class SalaryTemplateWrapper extends Service { item.setOriginName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); if(itemShowNameMap.containsKey(salaryItemId)){ item.setSalaryItemShowName(itemShowNameMap.get(salaryItemId)); -// item.setName(itemShowNameMap.get(salaryItemId) + "（" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) +"）"); - item.setName("base64_" + Base64Encoder.encode(itemShowNameMap.get(salaryItemId) + "（" + item.getName() +"）")); - item.setSalaryItemShowName("base64_" + Base64Encoder.encode(item.getSalaryItemShowName())); + item.setName(itemShowNameMap.get(salaryItemId) + "（" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) +"）"); +// item.setName("base64_" + Base64Encoder.encode(itemShowNameMap.get(salaryItemId) + "（" + item.getName() +"）")); +// item.setSalaryItemShowName("base64_" + Base64Encoder.encode(item.getSalaryItemShowName())); +// item.setOriginName("base64_" + Base64Encoder.encode(item.getOriginName())); }else{ item.setSalaryItemShowName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); -// item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); - item.setName("base64_" + Base64Encoder.encode(item.getName())); - item.setSalaryItemShowName("base64_" + Base64Encoder.encode(item.getSalaryItemShowName())); + item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); +// item.setName("base64_" + Base64Encoder.encode(item.getName())); +// item.setSalaryItemShowName("base64_" + Base64Encoder.encode(item.getSalaryItemShowName())); +// item.setOriginName("base64_" + Base64Encoder.encode(item.getOriginName())); } }); } else { @@ -594,12 +596,12 @@ public class SalaryTemplateWrapper extends Service { item.setOriginName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); if(itemShowNameMap.containsKey(salaryItemId)){ item.setSalaryItemShowName(itemShowNameMap.get(salaryItemId)); -// item.setName(itemShowNameMap.get(salaryItemId) + "(" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) + ")"); - item.setName("base64_" + Base64Encoder.encode(itemShowNameMap.get(salaryItemId) + "（" + item.getName() +"）")); + item.setName(itemShowNameMap.get(salaryItemId) + "(" + itemIdNameMap.getOrDefault(salaryItemId, item.getName()) + ")"); +// item.setName("base64_" + Base64Encoder.encode(itemShowNameMap.get(salaryItemId) + "（" + item.getName() +"）")); }else{ item.setSalaryItemShowName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); -// item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); - item.setName("base64_" + Base64Encoder.encode(item.getName())); + item.setName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); +// item.setName("base64_" + Base64Encoder.encode(item.getName())); } }); } else {