From 54542c9a9488e2b395e482a69a8cdc69b02e5a3a Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 14 Dec 2023 13:47:53 +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=E4=BC=98=E5=8C=96=EF=BC=8C=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=94=AF=E6=8C=81=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salaryBill/bo/SalaryBillItemNameBO.java | 3 ++- .../salary/service/impl/SalarySendServiceImpl.java | 7 +++++-- .../salary/wrapper/SalaryTemplateWrapper.java | 14 ++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java index ce1deaf67..4ad320496 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryBill.bo; +import cn.hutool.core.codec.Base64Encoder; import com.engine.salary.entity.salaryBill.dto.SalaryBillItemNameDTO; import com.engine.salary.entity.salaryBill.po.SalaryBillItemNamePO; import org.apache.commons.collections4.CollectionUtils; @@ -23,7 +24,7 @@ public class SalaryBillItemNameBO { return SalaryBillItemNamePOList.stream() .map(po -> SalaryBillItemNameDTO.builder() .salaryItemId(po.getSalaryItemId()) - .salaryItemShowName(po.getSalaryItemShowName()) + .salaryItemShowName("base64_" + Base64Encoder.encode(po.getSalaryItemShowName())) .build()) .collect(Collectors.toList()); } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 2a0054536..716e76571 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -605,11 +605,14 @@ 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(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(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 49ef2811d..746df694d 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -346,10 +346,14 @@ 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(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())); }else{ item.setSalaryItemShowName(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); - item.setName(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())); } }); } else { @@ -590,10 +594,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(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(itemIdNameMap.getOrDefault(salaryItemId, item.getName())); + item.setName("base64_" + Base64Encoder.encode(item.getName())); } }); } else {