qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言

This commit is contained in:
sy 2023-12-14 17:10:27 +08:00
parent 46b0cefe08 19ce3e8146
commit be4fccd5c2
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/entity/salaryBill/bo/SalaryBillItemNameBO.java
View File

@ -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());
}

2
src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
View File

@ -168,6 +168,8 @@ public class SalaryTemplateBO {
.id(String.valueOf(e.getSalaryItemId()))
.salaryItemId(String.valueOf(e.getSalaryItemId()))
.name(e.getName())
.salaryItemShowName(e.getName())
.originName(e.getName())
.sortedIndex(e.getSortedIndex())
.build()
);

2
src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
View File

@ -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())

7
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -612,9 +612,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
}
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())));
}
}
}

22
src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
View File

@ -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 {