From b27a378baa14fd913067c2d5f0fdea4a9facd2c5 Mon Sep 17 00:00:00 2001 From: sy Date: Sun, 8 Oct 2023 10:27:27 +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=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=B3=BB=E7=BB=9F=E5=88=86=E7=BB=84=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/bo/SalaryAcctResultBO.java | 8 ++++++-- .../bo/SalarySobItemAggregateBO.java | 20 ++++++++++++------- .../entity/salarysob/bo/SalarySobItemBO.java | 1 + .../po/SalarySobDefaultItemGroupPO.java | 5 +++++ .../salarysob/po/SalarySobItemGroupPO.java | 5 +++++ .../SalarySobDefaultItemGroupMapper.xml | 2 ++ .../salarysob/SalarySobItemGroupMapper.xml | 3 +++ .../impl/SalaryAcctExcelServiceImpl.java | 16 +++++++++++---- .../impl/SalaryAcctResultServiceImpl.java | 1 + 9 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 89b72f2b3..fad620868 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -409,12 +409,16 @@ public class SalaryAcctResultBO { for(SalarySobItemGroupPO groupPO : salarySobItemGroupPOS){ List groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(),Collections.emptyList()); if(CollectionUtils.isNotEmpty(groupItems)){ + //获取name（多语言） + String name = ""; + name = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),groupPO.getLabelId(),groupPO.getName()) : groupPO.getName(); + List items = groupItems.stream() .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, user)) .collect(Collectors.toList()); itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder() .salarySobItemGroupId(groupPO.getId()) - .salarySobItemGroupName(groupPO.getName()) + .salarySobItemGroupName(name) .salaryItems(items) .sortedIndex(groupPO.getSortedIndex()).build() ); } @@ -427,7 +431,7 @@ public class SalaryAcctResultBO { .collect(Collectors.toList()); itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder() .salarySobItemGroupId(0L) - .salarySobItemGroupName("未分类") + .salarySobItemGroupName(SalaryI18nUtil.getI18nLabel(user.getLanguage(), 388970,"未分类")) .salaryItems(items) .sortedIndex(itemsByGroup.size()).build()); } diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java index 069195d6c..958a8c937 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java @@ -14,6 +14,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.AllArgsConstructor; +import net.sf.cglib.asm.$AnnotationVisitor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -89,13 +90,18 @@ public class SalarySobItemAggregateBO { List itemsWithoutGroup = Lists.newArrayList(); // 薪资账套的薪资项目分类po转换成dto List salarySobItemGroupDTOS = salarySobItemGroups.stream() - .map(e -> SalarySobItemGroupDTO.builder() - .id(e.getId()) - .salarySobId(e.getSalarySobId()) - .name(e.getName()) - .sortedIndex(e.getSortedIndex()) - .itemHide(e.getItemHide()) - .build()) + .map(e -> { + //获取name（多语言） + String name = ""; + name = e.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), e.getLabelId(), e.getName()) : e.getName(); + return SalarySobItemGroupDTO.builder() + .id(e.getId()) + .salarySobId(e.getSalarySobId()) + .name(name) + .sortedIndex(e.getSortedIndex()) + .itemHide(e.getItemHide()) + .build(); + }) .collect(Collectors.toList()); Map salarySobItemGroupDTOMap = SalaryEntityUtil.convert2Map(salarySobItemGroupDTOS, SalarySobItemGroupDTO::getId); diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java index 3e2513908..a537ccebc 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java @@ -77,6 +77,7 @@ public class SalarySobItemBO { salarySobItemGroups.add(SalarySobItemGroupPO.builder() .id(salarySobItemGroupId) .name(salarySobDefaultItemGroupPO.getName()) + .labelId(salarySobDefaultItemGroupPO.getLabelId()) .salarySobId(salarySobId) .sortedIndex(salarySobDefaultItemGroupPO.getSortedIndex()) .description(salarySobDefaultItemGroupPO.getDescription()) diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemGroupPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemGroupPO.java index bca70753e..10fcd96b0 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemGroupPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemGroupPO.java @@ -40,6 +40,11 @@ public class SalarySobDefaultItemGroupPO { */ private String name; + /** + * 多语言label_id + */ + private Integer labelId; + /** * 显示顺序 */ diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java index 4a6b5502a..02c284751 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java @@ -38,6 +38,11 @@ public class SalarySobItemGroupPO { */ private String name; + /** + * 多语言label_id + */ + private Integer labelId; + /** * 排序字段 */ diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml index 81e68abdd..b75a9ce34 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml @@ -12,6 +12,7 @@ + @@ -28,6 +29,7 @@ , t.creator , t.delete_type , t.tenant_key + , t.label_id diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml index bd29320f7..3d4d9044a 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml @@ -13,6 +13,7 @@ + @@ -29,6 +30,7 @@ , t.creator , t.delete_type , t.tenant_key + , t.label_id @@ -111,6 +113,7 @@ , t.delete_type , t.tenant_key , h.item_hide + , t.label_id from hrsa_salary_sob_item_group t LEFT JOIN hrsa_salary_item_hide h ON t.id=h.salary_item_id where t.delete_type=0 diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index b8634af1c..37731fc19 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -439,9 +439,13 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc }) .collect(Collectors.toList()); + //获取name（多语言） + String groupName = ""; + groupName = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()) : groupPO.getName(); + itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder() .salarySobItemGroupId(groupPO.getId()) - .salarySobItemGroupName(groupPO.getName()) + .salarySobItemGroupName(groupName) .salaryItems(items) .sortedIndex(groupPO.getSortedIndex()).build() ); } @@ -465,7 +469,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder() .salarySobItemGroupId(0L) - .salarySobItemGroupName("未分类") + .salarySobItemGroupName(SalaryI18nUtil.getI18nLabel(user.getLanguage(), 388970,"未分类")) .salaryItems(items) .sortedIndex(itemsByGroup.size()).build()); } @@ -544,9 +548,13 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc }) .collect(Collectors.toList()); + //获取name（多语言） + String groupName = ""; + groupName = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()) : groupPO.getName(); + itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder() .salarySobItemGroupId(groupPO.getId()) - .salarySobItemGroupName(groupPO.getName()) + .salarySobItemGroupName(groupName) .salaryItems(items) .sortedIndex(groupPO.getSortedIndex()).build() ); } @@ -570,7 +578,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder() .salarySobItemGroupId(0L) - .salarySobItemGroupName("未分类") + .salarySobItemGroupName(SalaryI18nUtil.getI18nLabel(user.getLanguage(), 388970,"未分类")) .salaryItems(items) .sortedIndex(itemsByGroup.size()).build()); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 870d9a274..b623c3cfc 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -247,6 +247,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe List hideGroupIDs = getSalarySobItemHideService(user).listHideGroupBysalarySobId(SalarySobItemHidePO.builder().salarySobId(salaryAcctEmployeePO.getSalarySobId()).isGroup(1).build()); // 过滤关闭显示的薪资项目分类 salarySobItemGroupPOS = salarySobItemGroupPOS.stream().filter(group -> !(hideGroupIDs.contains(group.getId()))).collect(Collectors.toList()); + // 获取薪资项目分类ID List salarySobItemGroupIds = salarySobItemGroupPOS.stream().map(SalarySobItemGroupPO::getId).collect(Collectors.toList()); //加上未分类