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

薪酬系统-多语言，薪资项目、薪资项目分组更改名称获取逻辑（适配多语言）

This commit is contained in:
sy 2023-11-14 13:49:10 +08:00
parent 8c514ffd7d
commit 40a0f2afba
27 changed files with 141 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
View File

@ -30,6 +30,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.BeanUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.lang.reflect.Field;
@ -411,7 +412,9 @@ public class SalaryAcctResultBO {
if(CollectionUtils.isNotEmpty(groupItems)){
//获取name（多语言）
String name = "";
name = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),groupPO.getLabelId(),groupPO.getName()) : groupPO.getName();
// name = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),groupPO.getLabelId(),groupPO.getName()) : groupPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(groupPO.getName(), String.valueOf(user.getLanguage()));
List<SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO> items = groupItems.stream()
.map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, user))
@ -514,7 +517,9 @@ public class SalaryAcctResultBO {
//获取name（多语言）
String name = "";
if (salaryItemPO != null) {
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// 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()));
}
// 薪资项目的数据类型
return SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO.builder()

5
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
View File

@ -25,6 +25,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
@ -89,7 +90,9 @@ public class SalaryArchiveBO {
for (SalaryItemPO salaryItem : salaryItems) {
//获取name（多语言）
String name = "";
name = salaryItem.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItem.getLabelId(),salaryItem.getName()) : salaryItem.getName();
// 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()));
columns.add(new WeaTableColumn("100px", name, salaryItem.getId() + SalaryItemConstant.DYNAMIC_SUFFIX));
}
columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),30585, "操作"), "operate"));

5
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
View File

@ -29,6 +29,7 @@ import dm.jdbc.util.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.User;
@ -829,7 +830,9 @@ public class SalaryArchiveExcelBO extends Service {
Optional<SalaryItemPO> optionalSalaryItem = importHandleParam.getSalaryItems().stream().filter(e -> {
//获取name（多语言）
String name = "";
name = e.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(),e.getName()) : e.getName();
// name = e.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(),e.getName()) : e.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(e.getName(), String.valueOf(user.getLanguage()));
return name.equals(key);
}).findFirst();
// 可以处理薪资项目的条件：有薪资项目+待定薪列表+定薪列表（调薪和初始化导入）

17
src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
View File

@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.conn.util.IdGenerator;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.hrm.User;
import java.lang.reflect.Field;
@ -96,14 +97,18 @@ public class SalaryItemBO {
SalaryDataTypeEnum salaryDataTypeEnum = SalaryDataTypeEnum.parseByValue(salaryItemPO.getDataType());
//获取name（多语言）
String name = "";
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// 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()));
//获取systemName（多语言）
String systemName = "";
if (sysSalaryItemMap.get(salaryItemPO.getSysSalaryItemId()) != null) {
SysSalaryItemPO sysSalaryItemPO = sysSalaryItemMap.get(salaryItemPO.getSysSalaryItemId());
systemName = sysSalaryItemPO.getLabelId() != null
? SalaryI18nUtil.getI18nLabel(user.getLanguage(),sysSalaryItemPO.getLabelId(),sysSalaryItemPO.getName())
: sysSalaryItemPO.getName();
// systemName = sysSalaryItemPO.getLabelId() != null
// ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),sysSalaryItemPO.getLabelId(),sysSalaryItemPO.getName())
// : sysSalaryItemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
systemName = Util.formatMultiLang(sysSalaryItemPO.getName(), String.valueOf(user.getLanguage()));
}
return SalaryItemListDTO.builder()
@ -199,7 +204,9 @@ public class SalaryItemBO {
public static SalaryItemFormDTO convert2FormDTO(SalaryItemPO salaryItemPO, User user) {
//获取name（多语言）
String name = "";
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// 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()));
return new SalaryItemFormDTO()
.setId(salaryItemPO.getId())
.setName(name)

7
src/com/engine/salary/entity/salaryitem/bo/SysSalaryItemBO.java
View File

@ -14,6 +14,7 @@ import dm.jdbc.util.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.time.LocalDateTime;
@ -90,7 +91,9 @@ public class SysSalaryItemBO {
public static SalaryItemFormDTO convert2FormDTO(SysSalaryItemPO sysSalaryItemPO, User user) {
//获取name（多语言）
String name = "";
name = sysSalaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),sysSalaryItemPO.getLabelId(),sysSalaryItemPO.getName()) : sysSalaryItemPO.getName();
// name = sysSalaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),sysSalaryItemPO.getLabelId(),sysSalaryItemPO.getName()) : sysSalaryItemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(sysSalaryItemPO.getName(), String.valueOf(user.getLanguage()));
return new SalaryItemFormDTO()
.setId(sysSalaryItemPO.getId())
.setName(name)
@ -160,7 +163,7 @@ public class SysSalaryItemBO {
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
.taxAgentIds(sysSalaryItemPO.getTaxAgentIds())
.sharedType(sysSalaryItemPO.getSharedType())
.labelId(sysSalaryItemPO.getLabelId())
// .labelId(sysSalaryItemPO.getLabelId())
.build();
}
}

8
src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
View File

@ -135,10 +135,10 @@ public class SalaryItemPO {
*/
private Date updateTime;
/**
* 多语言label_id
*/
private Integer labelId;
// /**
// * 多语言label_id
// */
// private Integer labelId;
//查询条件
Collection<Long> ids;

8
src/com/engine/salary/entity/salaryitem/po/SysSalaryItemPO.java
View File

@ -125,10 +125,10 @@ public class SysSalaryItemPO {
*/
private Date updateTime;
/**
* 多语言label_id
*/
private Integer labelId;
// /**
// * 多语言label_id
// */
// private Integer labelId;
//查询条件
private Collection<Long> ids;

5
src/com/engine/salary/entity/salarysob/bo/SalarySobAdjustRuleBO.java
View File

@ -10,6 +10,7 @@ import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
@ -67,7 +68,9 @@ public class SalarySobAdjustRuleBO {
.map(salaryItemPO -> {
//获取name
String name = "";
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// 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()));
return new SalaryItemBaseDTO()
.setSalaryItemId(salaryItemPO.getId())
.setSalaryItemName(name);

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

@ -19,6 +19,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.hrm.User;
import java.lang.reflect.Field;
@ -93,7 +94,9 @@ public class SalarySobItemAggregateBO {
.map(e -> {
//获取name（多语言）
String name = "";
name = e.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), e.getLabelId(), e.getName()) : e.getName();
// name = e.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), e.getLabelId(), e.getName()) : e.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(e.getName(), String.valueOf(user.getLanguage()));
return SalarySobItemGroupDTO.builder()
.id(e.getId())
.salarySobId(e.getSalarySobId())
@ -130,7 +133,9 @@ public class SalarySobItemAggregateBO {
if (salaryItemPO != null) {
//获取name（多语言）
String name = "";
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// 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()));
Integer valueType = Optional.ofNullable(salarySobItemPO.getValueType()).orElse(salaryItemPO.getValueType());
items.add(SalarySobItemDTO.builder()
@ -186,7 +191,9 @@ public class SalarySobItemAggregateBO {
SalaryItemPO salaryItem = salaryItemMap.get(salarySobBackItem.getSalaryItemId());
//获取name（多语言）
String name = "";
name = salaryItem.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItem.getLabelId(),salaryItem.getName()) : salaryItem.getName();
// 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()));
return SalarySobItemDTO.builder()
.id(salarySobBackItem.getId())
.salarySobId(salarySob.getId())

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

@ -77,7 +77,7 @@ public class SalarySobItemBO {
salarySobItemGroups.add(SalarySobItemGroupPO.builder()
.id(salarySobItemGroupId)
.name(salarySobDefaultItemGroupPO.getName())
.labelId(salarySobDefaultItemGroupPO.getLabelId())
// .labelId(salarySobDefaultItemGroupPO.getLabelId())
.salarySobId(salarySobId)
.sortedIndex(salarySobDefaultItemGroupPO.getSortedIndex())
.description(salarySobDefaultItemGroupPO.getDescription())

8
src/com/engine/salary/entity/salarysob/po/SalarySobDefaultItemGroupPO.java
View File

@ -40,10 +40,10 @@ public class SalarySobDefaultItemGroupPO {
*/
private String name;
/**
* 多语言label_id
*/
private Integer labelId;
// /**
// * 多语言label_id
// */
// private Integer labelId;
/**
* 显示顺序

8
src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java
View File

@ -38,10 +38,10 @@ public class SalarySobItemGroupPO {
*/
private String name;
/**
* 多语言label_id
*/
private Integer labelId;
// /**
// * 多语言label_id
// */
// private Integer labelId;
/**
* 排序字段

5
src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml
View File

@ -24,7 +24,7 @@
<result column="shared_type" property="sharedType"/>
<result column="tax_agent_ids" property="taxAgentIds"/>
<result column="sorted_index" property="sortedIndex"/>
<result column="label_id" property="labelId"/>
<!-- <result column="label_id" property="labelId"/>-->
</resultMap>
<!-- 表字段 -->
@ -52,8 +52,7 @@
t.shared_type,
t.tax_agent_ids,
t.sorted_index,
t.hide_default,
t.label_id
t.hide_default
</sql>
<!-- 查询全部 -->

4
src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml
View File

@ -22,7 +22,7 @@
<result column="data_type" property="dataType"/>
<result column="shared_type" property="sharedType"/>
<result column="tax_agent_ids" property="taxAgentIds"/>
<result column="label_id" property="labelId"/>
<!-- <result column="label_id" property="labelId"/>-->
</resultMap>
<!-- 表字段 -->
@ -48,7 +48,7 @@
, t.create_time
, t.update_time
, t.data_type
, t.label_id
</sql>
<!-- 查询全部 -->

4
src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml
View File

@ -12,7 +12,7 @@
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="tenant_key" property="tenantKey"/>
<result column="label_id" property="labelId"/>
<!-- <result column="label_id" property="labelId"/>-->
</resultMap>
<!-- 表字段 -->
@ -29,7 +29,7 @@
, t.creator
, t.delete_type
, t.tenant_key
, t.label_id
</sql>
<!-- 查询全部 -->

5
src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml
View File

@ -13,7 +13,7 @@
<result column="delete_type" property="deleteType"/>
<result column="tenant_key" property="tenantKey"/>
<result column="item_hide" property="itemHide"/>
<result column="label_id" property="labelId"/>
<!-- <result column="label_id" property="labelId"/>-->
</resultMap>
<!-- 表字段 -->
@ -30,7 +30,6 @@
, t.creator
, t.delete_type
, t.tenant_key
, t.label_id
</sql>
<!-- 查询全部 -->
@ -113,7 +112,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
<if test="id != null">

2
src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml
View File

@ -29,7 +29,7 @@
, t.creator
, t.delete_type
, t.tenant_key
-- , t.label_id
</sql>
<sql id="paramSql">

5
src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
View File

@ -24,6 +24,7 @@ import com.google.common.collect.Maps;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.math.BigDecimal;
@ -116,7 +117,9 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
salaryStatisticsEmployeeDetailResult.getSalaryItemList().forEach(item -> {
//获取name（多语言）
String name = "";
name = item.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),item.getLabelId(),item.getName()) : item.getName();
// name = item.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),item.getLabelId(),item.getName()) : item.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(item.getName(), String.valueOf(user.getLanguage()));
columns.add(new WeaTableColumn("100px", name, item.getId() + SalaryConstant.DYNAMIC_SUFFIX));
});
return columns;

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

@ -33,6 +33,7 @@ import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import weaver.general.Util;
import weaver.hrm.User;
import java.lang.reflect.Field;
@ -362,11 +363,12 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic
//薪资项目取消过滤档案，使得导入功能一页面为准
// .filter(e -> e.getUseInEmployeeSalary() == 0)
.filter(e -> getSalaryItemService(user).filterInRange(taxAgentIds, e))
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
.map(e -> {
FormulaVar formulaVar = new FormulaVar();
formulaVar.setFieldId(referenceEnum.getValue() + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR + e.getCode());
formulaVar.setName(e.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(),e.getName()) : e.getName());
formulaVar.setName(Util.formatMultiLang(e.getName(), String.valueOf(user.getLanguage())));
formulaVar.setSource("" + referenceEnum.getValue());
formulaVar.setFieldType(e.getDataType());
return formulaVar;
@ -393,10 +395,11 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic
return salaryItems.stream()
.filter(e -> e.getUseInEmployeeSalary() == 1)
.filter(e-> getSalaryItemService(user).filterInRange(taxAgentIds, e))
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
.map(e -> {
FormulaVar formulaVar = new FormulaVar();
formulaVar.setFieldId(referenceEnum.getValue() + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR + e.getCode());
formulaVar.setName(e.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),e.getLabelId(),e.getName()) : e.getName());
formulaVar.setName(Util.formatMultiLang(e.getName(), String.valueOf(user.getLanguage())));
formulaVar.setSource("" + referenceEnum.getValue());
formulaVar.setFieldType(e.getDataType());
return formulaVar;

28
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -444,7 +444,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
SalaryItemPO salaryItemPO = salaryItemMap.get(salarySobItemPO.getSalaryItemId());
String name = "";
if (salaryItemPO != null) {
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = weaver.general.Util.formatMultiLang(salaryItemPO.getName(), String.valueOf(user.getLanguage()));
}
return SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
.salaryItemId(salarySobItemPO.getSalaryItemId())
@ -455,7 +457,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
//获取name（多语言）
String groupName = "";
groupName = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()) : groupPO.getName();
// groupName = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()) : groupPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
groupName = Util.formatMultiLang(groupPO.getName(), String.valueOf(user.getLanguage()));
itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder()
.salarySobItemGroupId(groupPO.getId())
@ -472,7 +476,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
SalaryItemPO salaryItemPO = salaryItemMap.get(salarySobItemPO.getSalaryItemId());
String name = "";
if (salaryItemPO != null) {
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = weaver.general.Util.formatMultiLang(salaryItemPO.getName(), String.valueOf(user.getLanguage()));
}
return SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
.salaryItemId(salarySobItemPO.getSalaryItemId())
@ -553,7 +559,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
SalaryItemPO salaryItemPO = salaryItemMap.get(salarySobItemPO.getSalaryItemId());
String name = "";
if (salaryItemPO != null) {
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = weaver.general.Util.formatMultiLang(salaryItemPO.getName(), String.valueOf(user.getLanguage()));
}
return SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
.salaryItemId(salarySobItemPO.getSalaryItemId())
@ -564,7 +572,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
//获取name（多语言）
String groupName = "";
groupName = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()) : groupPO.getName();
// groupName = groupPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()) : groupPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
groupName = Util.formatMultiLang(groupPO.getName(), String.valueOf(user.getLanguage()));
itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder()
.salarySobItemGroupId(groupPO.getId())
@ -581,7 +591,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
SalaryItemPO salaryItemPO = salaryItemMap.get(salarySobItemPO.getSalaryItemId());
String name = "";
if (salaryItemPO != null) {
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = weaver.general.Util.formatMultiLang(salaryItemPO.getName(), String.valueOf(user.getLanguage()));
}
return SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
.salaryItemId(salarySobItemPO.getSalaryItemId())
@ -896,7 +908,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
Map<String, Long> salaryItemMap = new HashMap<>();
for (SalaryItemPO po : salaryItems) {
String name = "";
name = po.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),po.getLabelId(),po.getName()) : po.getName();
// name = po.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),po.getLabelId(),po.getName()) : po.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = weaver.general.Util.formatMultiLang(po.getName(), String.valueOf(user.getLanguage()));
if (StringUtils.isNotBlank(name)) {
salaryItemMap.put(name, po.getId());
}

4
src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
View File

@ -314,7 +314,9 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
for (SalaryItemPO salaryItem : salaryItems) {
//获取name（多语言）
String name = "";
name = salaryItem.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItem.getLabelId(),salaryItem.getName()) : salaryItem.getName();
// 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()));
header.add(name);
}
// 2.表头

4
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -514,7 +514,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
for (SalaryItemPO salaryItem : salaryItems) {
//获取name（多语言）
String name = "";
name = salaryItem.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItem.getLabelId(),salaryItem.getName()) : salaryItem.getName();
// 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()));
headerList.add(name);
}

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

@ -74,6 +74,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import weaver.common.MessageUtil;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.company.SubCompanyComInfo;
import weaver.hrm.resource.ResourceComInfo;
@ -581,10 +582,11 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
SalaryTemplateSalaryItemSetListDTO employeeInformation = optionalEmployeeInformation.orElse(null);
List<SalaryTemplateSalaryItemSetListDTO> itemSetListDTOS = listDTOS.stream().filter(e -> !SalaryTemplateSalaryItemSetGroupConstant.EMPLOYEE_INFO_GROUP_ID.equals(e.getGroupId())).collect(Collectors.toList());
//获取name（多语言）,并将发薪模板中的薪资项目名进行替换
List<SalaryItemPO> allSalaryItems = getSalaryItemService(user).listAll().stream().filter(f -> f.getLabelId() != null).collect(Collectors.toList());
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
List<SalaryItemPO> allSalaryItems = getSalaryItemService(user).listAll();
Map<String, String> salaryIdNameMap = new HashMap<>();
for (SalaryItemPO salaryItemPO : allSalaryItems) {
salaryIdNameMap.put(salaryItemPO.getId().toString(), SalaryI18nUtil.getI18nLabel(user.getLanguage(), salaryItemPO.getLabelId(), salaryItemPO.getName()));
salaryIdNameMap.put(salaryItemPO.getId().toString(), Util.formatMultiLang(salaryItemPO.getName(), String.valueOf(user.getLanguage())));
}
//获取groupname（多语言）,并将发薪模板中的薪资项目分组名进行替换
List<SalarySobItemGroupPO> allSalaryItemGroups = getSalarySobItemGroupMapper().listAll();
@ -592,11 +594,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
groupNameMap.put("222222222222222222", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542650, "无分类"));
if (allSalaryItemGroups.size() > 0) {
for (SalarySobItemGroupPO groupPO : allSalaryItemGroups) {
if (groupPO.getLabelId() != null) {
groupNameMap.put(groupPO.getId().toString(), SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()));
} else {
groupNameMap.put(groupPO.getId().toString(), "");
}
// if (groupPO.getLabelId() != null) {
// groupNameMap.put(groupPO.getId().toString(), SalaryI18nUtil.getI18nLabel(user.getLanguage(), groupPO.getLabelId(), groupPO.getName()));
// } else {
// groupNameMap.put(groupPO.getId().toString(), "");
// }
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
groupNameMap.put(groupPO.getId().toString(), Util.formatMultiLang(groupPO.getName(), String.valueOf(user.getLanguage())));
}
}
for (SalaryTemplateSalaryItemSetListDTO setListDTO : itemSetListDTOS) {
@ -1140,10 +1144,11 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
);
}
//获取name（多语言）,并将发薪模板中的薪资项目名进行替换
List<SalaryItemPO> allSalaryItems = getSalaryItemService(user).listAll().stream().filter(f -> f.getLabelId() != null).collect(Collectors.toList());
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
List<SalaryItemPO> allSalaryItems = getSalaryItemService(user).listAll();
Map<String, String> salaryIdNameMap = new HashMap<>();
for (SalaryItemPO po : allSalaryItems) {
salaryIdNameMap.put(po.getId().toString(), SalaryI18nUtil.getI18nLabel(user.getLanguage(), po.getLabelId(), po.getName()));
salaryIdNameMap.put(po.getId().toString(), Util.formatMultiLang(po.getName(), String.valueOf(user.getLanguage())));
}
for (SalaryTemplateSalaryItemListDTO dto : salaryItems) {
if (salaryIdNameMap.get(dto.getSalaryItemId()) != null) {

5
src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
View File

@ -31,6 +31,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
@ -778,7 +779,9 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
Integer valueType = salarySobItemPO.getValueType() == null ? salaryItemPO.getValueType() : salarySobItemPO.getValueType();
//获取name（多语言）
String name = "";
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
// 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()));
salarySobItemFormDTO
.setId(salarySobItemPO.getId())
.setName(name)

6
src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
View File

@ -26,6 +26,7 @@ import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.BeanUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
@ -260,10 +261,11 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt
m.setAdjustReason(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryArchiveItemAdjustReasonEnum.getLabelId(), salaryArchiveItemAdjustReasonEnum.getDefaultLabel()));
});
//获取name（多语言），并将记录中的薪资项目名替换
List<SalaryItemPO> allSalaryItems = getSalaryItemService(user).listAll().stream().filter(f -> f.getLabelId() != null).collect(Collectors.toList());
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
List<SalaryItemPO> allSalaryItems = getSalaryItemService(user).listAll();
Map<String, String> salaryIdNameMap = new HashMap<>();
for (SalaryItemPO po : allSalaryItems) {
salaryIdNameMap.put(po.getId().toString(), SalaryI18nUtil.getI18nLabel(user.getLanguage(), po.getLabelId(), po.getName()));
salaryIdNameMap.put(po.getId().toString(), Util.formatMultiLang(po.getName(), String.valueOf(user.getLanguage())));
}
for (SalaryItemAdjustRecordListDTO dto : listResult) {
if (salaryIdNameMap.get(dto.getSalaryItemId().toString()) != null) {

5
src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
View File

@ -30,6 +30,7 @@ import com.google.common.collect.Maps;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
@ -372,7 +373,9 @@ public class SalaryArchiveWrapper extends Service {
salaryItemList.forEach(s -> {
//获取name（多语言）
String name = "";
name = s.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),s.getLabelId(),s.getName()) : s.getName();
// name = s.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),s.getLabelId(),s.getName()) : s.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(s.getName(), String.valueOf(user.getLanguage()));
Optional<SalaryArchiveItemPO> optionalItem = salaryArchiveItemList.stream().filter(f -> f.getSalaryItemId().equals(s.getId())).findFirst();
Map<String, Object> salaryItemMap = new LinkedHashMap<>();
salaryItemMap.put("id", s.getId());

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

@ -25,6 +25,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
@ -257,7 +258,9 @@ public class SalaryTemplateWrapper extends Service {
Map<Long, String> itemIdNameMap = new HashMap<>();
for (SalaryItemPO itemPO : itemPOS) {
String name = "";
name = itemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),itemPO.getLabelId(),itemPO.getName()) : itemPO.getName();
// name = itemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),itemPO.getLabelId(),itemPO.getName()) : itemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(itemPO.getName(), String.valueOf(user.getLanguage()));
if (StringUtils.isNotBlank(name)) {
itemIdNameMap.put(itemPO.getId(), name);
}
@ -450,7 +453,9 @@ public class SalaryTemplateWrapper extends Service {
Map<Long, String> itemIdNameMap = new HashMap<>();
for (SalaryItemPO itemPO : itemPOS) {
String name = "";
name = itemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),itemPO.getLabelId(),itemPO.getName()) : itemPO.getName();
// name = itemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),itemPO.getLabelId(),itemPO.getName()) : itemPO.getName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
name = Util.formatMultiLang(itemPO.getName(), String.valueOf(user.getLanguage()));
if (StringUtils.isNotBlank(name)) {
itemIdNameMap.put(itemPO.getId(), name);
}