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

Merge branch 'custom/上海港湾-多语言-240912' into custom/上海港湾-多语言

This commit is contained in:
Harryxzy 2024-09-25 11:24:44 +08:00
parent c59cf6644c e01fd9bca6
commit 6dffa32aae
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
View File

@ -1247,6 +1247,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
@Override
public void batchSave(List<AddUpSituation> list) {
if (CollectionUtils.isNotEmpty(list)) {
encryptUtil.encryptList(list, AddUpSituation.class, user);
List<List<AddUpSituation>> partition = Lists.partition(list, 50);
partition.forEach(getAddUpSituationMapper()::insertData);
}

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

@ -485,7 +485,7 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic
List<FormulaVar> formulaVars = fields.stream().map(e -> {
FormulaVar formulaVar = new FormulaVar();
formulaVar.setFieldId(referenceEnum.getValue() + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR + e.getId());
formulaVar.setName(e.getFieldName());
formulaVar.setName(Util.formatMultiLang(e.getFieldName(), String.valueOf(user.getLanguage())));
formulaVar.setSource("" + referenceEnum.getValue());
formulaVar.setFieldType(DataType.NUMBER);
return formulaVar;