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 14:10:34 +08:00
parent 5b41809853 54542c9a94
commit 7207be9278
3 changed files with 17 additions and 7 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

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

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

@ -607,11 +607,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())));
}
}
}

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

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