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

薪酬系统-多语言，修复部分页面为翻译问题0814

This commit is contained in:
sy 2023-08-14 18:33:58 +08:00
parent c8c0c9f13d
commit 12b7b1d24c
10 changed files with 96 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,9 +197,12 @@ public class SalaryItemBO {
* @return
*/
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();
return new SalaryItemFormDTO()
.setId(salaryItemPO.getId())
.setName(salaryItemPO.getName())
.setName(name)
.setSystemType(salaryItemPO.getSystemType())
.setUseDefault(salaryItemPO.getUseDefault())
.setHideDefault(salaryItemPO.getHideDefault() == null ? 0 : salaryItemPO.getHideDefault())

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

@ -87,10 +87,13 @@ public class SysSalaryItemBO {
* @param sysSalaryItemPO
* @return
*/
public static SalaryItemFormDTO convert2FormDTO(SysSalaryItemPO sysSalaryItemPO) {
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();
return new SalaryItemFormDTO()
.setId(sysSalaryItemPO.getId())
.setName(sysSalaryItemPO.getName())
.setName(name)
.setCanEdit(sysSalaryItemPO.getCanEdit())
.setSystemType(sysSalaryItemPO.getSystemType())
.setUseDefault(sysSalaryItemPO.getUseDefault())

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

@ -7,8 +7,10 @@ import com.engine.salary.entity.salarysob.dto.SalarySobAdjustRuleListDTO;
import com.engine.salary.entity.salarysob.param.SalarySobAdjustRuleSaveParam;
import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO;
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.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
@ -55,16 +57,21 @@ public class SalarySobAdjustRuleBO {
* @param salaryItems 薪资项目po
* @return
*/
public static List<SalaryItemBaseDTO> convertItemBaseDTO(List<SalaryItemPO> salaryItems) {
public static List<SalaryItemBaseDTO> convertItemBaseDTO(List<SalaryItemPO> salaryItems, User user) {
if (CollectionUtils.isEmpty(salaryItems)) {
return Collections.emptyList();
}
// 过滤开启了"薪资档案引用"的薪资项目
return salaryItems.stream()
.filter(salaryItemPO -> Objects.equals(salaryItemPO.getUseInEmployeeSalary(), NumberUtils.INTEGER_ONE))
.map(salaryItemPO -> new SalaryItemBaseDTO()
.setSalaryItemId(salaryItemPO.getId())
.setSalaryItemName(salaryItemPO.getName()))
.map(salaryItemPO -> {
//获取name
String name = "";
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
return new SalaryItemBaseDTO()
.setSalaryItemId(salaryItemPO.getId())
.setSalaryItemName(name);
})
.collect(Collectors.toList());
}

96
src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
View File

@ -841,110 +841,110 @@ public class SalaryStatisticsReportBO {
// 1.合计规则children
SalaryStatisticsItemRuleDTO countRule = JSON.parseObject(itemPO.getCountRule(), SalaryStatisticsItemRuleDTO.class);
if (countRule != null && 1 == countRule.getTotalValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157127, "本周期(计数)"), k + UD + COUNT + P_NOW));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期(计数)"), k + UD + COUNT + P_NOW));
}
if (countRule != null && 1 == countRule.getRatioValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174288, "本周期占比(计数)"), k + UD + COUNT + P_RATIO));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(计数)"), k + UD + COUNT + P_RATIO));
}
if (countRule != null && 1 == countRule.getM2mValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157128, "上周期(计数)"), k + UD + COUNT + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157129, "计数环比差值"), k + UD + COUNT + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157130, "计数环比增幅"), k + UD + COUNT + P_M2M_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "上周期(计数)"), k + UD + COUNT + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "计数环比差值"), k + UD + COUNT + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "计数环比增幅"), k + UD + COUNT + P_M2M_INCREASE));
}
if (countRule != null && 1 == countRule.getY2yValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),180672, "同比周期(计数)"), k + UD + COUNT + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174391, "计数同比差值"), k + UD + COUNT + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174392, "计数同比增幅"), k + UD + COUNT + P_Y2Y_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "同比周期(计数)"), k + UD + COUNT + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "计数同比差值"), k + UD + COUNT + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "计数同比增幅"), k + UD + COUNT + P_Y2Y_INCREASE));
}
// 2.求和规则children
SalaryStatisticsItemRuleDTO totalRule = JSON.parseObject(itemPO.getSumRule(), SalaryStatisticsItemRuleDTO.class);
if (totalRule != null && 1 == totalRule.getTotalValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157145, "本周期(求和)"), k + UD + SUM + P_NOW));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期(求和)"), k + UD + SUM + P_NOW));
}
if (totalRule != null && 1 == totalRule.getRatioValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174289, "本周期占比(求和)"), k + UD + SUM + P_RATIO));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(求和)"), k + UD + SUM + P_RATIO));
}
if (totalRule != null && 1 == totalRule.getM2mValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157146, "上周期(求和)"), k + UD + SUM + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157147, "求和环比差值"), k + UD + SUM + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),157148, "求和环比增幅"), k + UD + SUM + P_M2M_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "上周期(求和)"), k + UD + SUM + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "求和环比差值"), k + UD + SUM + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "求和环比增幅"), k + UD + SUM + P_M2M_INCREASE));
}
if (totalRule != null && 1 == totalRule.getY2yValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),180673, "同比周期(求和)"), k + UD + SUM + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174388, "求和同比差值"), k + UD + SUM + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174389, "求和同比增幅"), k + UD + SUM + P_Y2Y_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "同比周期(求和)"), k + UD + SUM + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "求和同比差值"), k + UD + SUM + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "求和同比增幅"), k + UD + SUM + P_Y2Y_INCREASE));
}
// 3.平均值规则children
SalaryStatisticsItemRuleDTO avgRule = JSON.parseObject(itemPO.getAvgRule(), SalaryStatisticsItemRuleDTO.class);
if (avgRule != null && 1 == avgRule.getTotalValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174258, "本周期(平均值)"), k + UD + AVG + P_NOW));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期(平均值)"), k + UD + AVG + P_NOW));
}
if (avgRule != null && 1 == avgRule.getRatioValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174290, "本周期占比(平均值)"), k + UD + AVG + P_RATIO));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(平均值)"), k + UD + AVG + P_RATIO));
}
if (avgRule != null && 1 == avgRule.getM2mValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174257, "上周期(平均值)"), k + UD + AVG + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174256, "平均值环比差值"), k + UD + AVG + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174255, "平均值环比增幅"), k + UD + AVG + P_M2M_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "上周期(平均值)"), k + UD + AVG + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "平均值环比差值"), k + UD + AVG + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "平均值环比增幅"), k + UD + AVG + P_M2M_INCREASE));
}
if (avgRule != null && 1 == avgRule.getY2yValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),180674, "同比周期(平均值)"), k + UD + AVG + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174385, "平均值同比差值"), k + UD + AVG + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174386, "平均值同比增幅"), k + UD + AVG + P_Y2Y_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "同比周期(平均值)"), k + UD + AVG + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "平均值同比差值"), k + UD + AVG + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "平均值同比增幅"), k + UD + AVG + P_Y2Y_INCREASE));
}
// 4.最大值规则children
SalaryStatisticsItemRuleDTO maxRule = JSON.parseObject(itemPO.getMaxRule(), SalaryStatisticsItemRuleDTO.class);
if (maxRule != null && 1 == maxRule.getTotalValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174254, "本周期(最大值)"), k + UD + MAX + P_NOW));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期(最大值)"), k + UD + MAX + P_NOW));
}
if (maxRule != null && 1 == maxRule.getRatioValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174291, "本周期占比(最大值)"), k + UD + MAX + P_RATIO));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(最大值)"), k + UD + MAX + P_RATIO));
}
if (maxRule != null && 1 == maxRule.getM2mValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174253, "上周期(最大值)"), k + UD + MAX + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174252, "最大值环比差值"), k + UD + MAX + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174251, "最大值环比增幅"), k + UD + MAX + P_M2M_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "上周期(最大值)"), k + UD + MAX + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最大值环比差值"), k + UD + MAX + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最大值环比增幅"), k + UD + MAX + P_M2M_INCREASE));
}
if (maxRule != null && 1 == maxRule.getY2yValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),180675, "同比周期(最大值)"), k + UD + MAX + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174382, "最大值同比差值"), k + UD + MAX + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174383, "最大值同比增幅"), k + UD + MAX + P_Y2Y_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "同比周期(最大值)"), k + UD + MAX + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最大值同比差值"), k + UD + MAX + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最大值同比增幅"), k + UD + MAX + P_Y2Y_INCREASE));
}
// 5.最小值规则children
SalaryStatisticsItemRuleDTO minRule = JSON.parseObject(itemPO.getMinRule(), SalaryStatisticsItemRuleDTO.class);
if (minRule != null && 1 == minRule.getTotalValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174250, "本周期(最小值)"), k + UD + MIN + P_NOW));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期(最小值)"), k + UD + MIN + P_NOW));
}
if (minRule != null && 1 == minRule.getRatioValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174292, "本周期占比(最小值)"), k + UD + MIN + P_RATIO));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(最小值)"), k + UD + MIN + P_RATIO));
}
if (minRule != null && 1 == minRule.getM2mValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174249, "上周期(最小值)"), k + UD + MIN + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174248, "最小值环比差值"), k + UD + MIN + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174247, "最小值环比增幅"), k + UD + MIN + P_M2M_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "上周期(最小值)"), k + UD + MIN + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最小值环比差值"), k + UD + MIN + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最小值环比增幅"), k + UD + MIN + P_M2M_INCREASE));
}
if (minRule != null && 1 == minRule.getY2yValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),180676, "同比周期(最小值)"), k + UD + MIN + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174379, "最小值同比差值"), k + UD + MIN + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174380, "最小值同比增幅"), k + UD + MIN + P_Y2Y_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "同比周期(最小值)"), k + UD + MIN + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最小值同比差值"), k + UD + MIN + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "最小值同比增幅"), k + UD + MIN + P_Y2Y_INCREASE));
}
// 6.中位数规则children
SalaryStatisticsItemRuleDTO medianRule = JSON.parseObject(itemPO.getMedianRule(), SalaryStatisticsItemRuleDTO.class);
if (medianRule != null && 1 == medianRule.getTotalValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174246, "本周期(中位数)"), k + UD + MEDIAN + P_NOW));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期(中位数)"), k + UD + MEDIAN + P_NOW));
}
if (medianRule != null && 1 == medianRule.getRatioValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174293, "本周期占比(中位数)"), k + UD + MEDIAN + P_RATIO));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(中位数)"), k + UD + MEDIAN + P_RATIO));
}
if (medianRule != null && 1 == medianRule.getM2mValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174245, "上周期(中位数)"), k + UD + MEDIAN + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174244, "中位数环比差值"), k + UD + MEDIAN + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174243, "中位数环比增幅"), k + UD + MEDIAN + P_M2M_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "上周期(中位数)"), k + UD + MEDIAN + P_LAST));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "中位数环比差值"), k + UD + MEDIAN + P_M2M_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "中位数环比增幅"), k + UD + MEDIAN + P_M2M_INCREASE));
}
if (medianRule != null && 1 == medianRule.getY2yValue()) {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),180677, "同比周期(中位数)"), k + UD + MEDIAN + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174376, "中位数同比差值"), k + UD + MEDIAN + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),174377, "中位数同比增幅"), k + UD + MEDIAN + P_Y2Y_INCREASE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "同比周期(中位数)"), k + UD + MEDIAN + P_SAME));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "中位数同比差值"), k + UD + MEDIAN + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "中位数同比增幅"), k + UD + MEDIAN + P_Y2Y_INCREASE));
}
weaTableColumn.setChildren(children);
result.add(weaTableColumn);

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

@ -680,7 +680,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
List<SalarySendInfoListDTO> page = salarySendInfoMapper.list(queryParam);
PageInfo<SalarySendInfoListDTO> pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
page, SalarySendInfoListDTO.class);
page, SalarySendInfoListDTO.class, user);
SalarySendPO salarySendPO = getSalarySendMapper().getById(queryParam.getSalarySendId());
if (ObjectUtils.isEmpty(salarySendPO)){
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),544321, "工资单不存在或已被删除"));

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

@ -769,9 +769,12 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
String formulaContent = CollectionUtils.isEmpty(expressFormulas) ? "" : expressFormulas.get(0).getFormula();
Integer valueType = ObjectUtils.isEmpty(salarySobItemPO.getValueType()) ? salaryItemPO.getValueType() : salarySobItemPO.getValueType();
//获取name（多语言）
String name = "";
name = salaryItemPO.getLabelId() != null ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryItemPO.getLabelId(),salaryItemPO.getName()) : salaryItemPO.getName();
salarySobItemFormDTO
.setId(salarySobItemPO.getId())
.setName(salaryItemPO.getName())
.setName(name)
.setItemHide(hideItemIds.contains(salaryItemPO.getId()) ? 1 : 0)
.setDataType(salaryItemPO.getDataType())
.setRoundingMode(ObjectUtils.isEmpty(salarySobItemPO.getRoundingMode()) ? salaryItemPO.getRoundingMode() : salarySobItemPO.getRoundingMode())

2
src/com/engine/salary/wrapper/SalaryFieldWrapper.java
View File

@ -102,7 +102,7 @@ public class SalaryFieldWrapper extends Service {
salaryItemListDTOPage.setPageNum(page.getPageNum());
salaryItemListDTOPage.setTotal(page.getTotal());
//获取字段管理的字段列表
PageInfo<SalaryFieldListDTO> fieldColumnsPage = new PageInfo<>(SalaryFieldListDTO.class);
PageInfo<SalaryFieldListDTO> fieldColumnsPage = new PageInfo<>(SalaryFieldListDTO.class, user);
List<Column> fieldColumns = fieldColumnsPage.getColumns();
salaryItemListDTOPage.getColumns().clear();
salaryItemListDTOPage.setColumns(fieldColumns);

2
src/com/engine/salary/wrapper/SalaryItemWrapper.java
View File

@ -186,7 +186,7 @@ public class SalaryItemWrapper extends Service {
ExpressFormula expressFormula;
// // 转换成薪资项目详情dto
if (Objects.isNull(salaryItemPO)) {
salaryItemFormDTO = SysSalaryItemBO.convert2FormDTO(sysSalaryItemPO);
salaryItemFormDTO = SysSalaryItemBO.convert2FormDTO(sysSalaryItemPO, user);
expressFormula = getSalaryFormulaService(user).getExpressFormula(sysSalaryItemPO.getFormulaId());
} else {
salaryItemFormDTO = SalaryItemBO.convert2FormDTO(salaryItemPO, user);

2
src/com/engine/salary/wrapper/SalarySobAdjustRuleWrapper.java
View File

@ -82,7 +82,7 @@ public class SalarySobAdjustRuleWrapper extends Service {
Set<Long> salaryItemIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getSalaryItemId);
List<SalaryItemPO> salaryItemPOS = getSalaryItemService(user).listByIds(salaryItemIds);
// 转换成dto
return SalarySobAdjustRuleBO.convertItemBaseDTO(salaryItemPOS);
return SalarySobAdjustRuleBO.convertItemBaseDTO(salaryItemPOS, user);
}
/**

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

@ -253,7 +253,16 @@ public class SalaryTemplateWrapper extends Service {
//同步项目名称
List<SalaryItemPO> itemPOS = getSalaryItemService(user).listAll();
Map<Long, String> itemIdNameMap = SalaryEntityUtil.convert2Map(itemPOS, SalaryItemPO::getId, SalaryItemPO::getName);
//获取SalaryItemPO的id-name集合关系map
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();
if (StringUtils.isNotBlank(name)) {
itemIdNameMap.put(itemPO.getId(), name);
}
}
// Map<Long, String> itemIdNameMap = SalaryEntityUtil.convert2Map(itemPOS, SalaryItemPO::getId, SalaryItemPO::getName);
// List<SalarySobItemGroupPO> groupPOS = getSalarySobItemGroupService(user).listBySalarySobId(po.getSalarySobId());
// Map<Long, String> groupIdNameMap = SalaryEntityUtil.convert2Map(groupPOS, SalarySobItemGroupPO::getId, SalarySobItemGroupPO::getName);
@ -436,7 +445,16 @@ public class SalaryTemplateWrapper extends Service {
replenishSalaryItemSetting = JsonUtil.parseList(po.getReplenishSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class);
// 同步补发薪资项目名称
List<SalaryItemPO> itemPOS = getSalaryItemService(user).listAll();
Map<Long, String> itemIdNameMap = SalaryEntityUtil.convert2Map(itemPOS, SalaryItemPO::getId, SalaryItemPO::getName);
// Map<Long, String> itemIdNameMap = SalaryEntityUtil.convert2Map(itemPOS, SalaryItemPO::getId, SalaryItemPO::getName);
//获取SalaryItemPO的id-name集合关系map
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();
if (StringUtils.isNotBlank(name)) {
itemIdNameMap.put(itemPO.getId(), name);
}
}
// 获取工资单薪资项目展示名信息
List<SalaryBillItemNamePO> billItemNameList = getSalaryBillItemNameService(user).ListByTemplateAndType(SalaryBillItemNamePO.builder().salaryTemplateId(id).salaryBillType(1).build());
Map<Long, String> itemShowNameMap = SalaryEntityUtil.convert2Map(billItemNameList, SalaryBillItemNamePO::getSalaryItemId, SalaryBillItemNamePO::getSalaryItemShowName);