薪酬系统-多语言，适配部分中文表述，待处理薪资项目分组名转义逻辑
This commit is contained in:
sy
parent
12b7b1d24c
commit
735f3870fa
Binary file not shown.
Binary file not shown.
|
|
@ -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(),0, "本周期(计数)"), k + UD + COUNT + P_NOW));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544728, "本周期(计数)"), k + UD + COUNT + P_NOW));
|
||||
}
|
||||
if (countRule != null && 1 == countRule.getRatioValue()) {
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(计数)"), k + UD + COUNT + P_RATIO));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544729, "本周期占比(计数)"), k + UD + COUNT + P_RATIO));
|
||||
}
|
||||
if (countRule != null && 1 == countRule.getM2mValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544730, "上周期(计数)"), k + UD + COUNT + P_LAST));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544731, "计数环比差值"), k + UD + COUNT + P_M2M_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544732, "计数环比增幅"), k + UD + COUNT + P_M2M_INCREASE));
|
||||
}
|
||||
if (countRule != null && 1 == countRule.getY2yValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544733, "同比周期(计数)"), k + UD + COUNT + P_SAME));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544734, "计数同比差值"), k + UD + COUNT + P_Y2Y_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544735, "计数同比增幅"), 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(),0, "本周期(求和)"), k + UD + SUM + P_NOW));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544736, "本周期(求和)"), k + UD + SUM + P_NOW));
|
||||
}
|
||||
if (totalRule != null && 1 == totalRule.getRatioValue()) {
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(求和)"), k + UD + SUM + P_RATIO));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544737, "本周期占比(求和)"), k + UD + SUM + P_RATIO));
|
||||
}
|
||||
if (totalRule != null && 1 == totalRule.getM2mValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544738, "上周期(求和)"), k + UD + SUM + P_LAST));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544739, "求和环比差值"), k + UD + SUM + P_M2M_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544740, "求和环比增幅"), k + UD + SUM + P_M2M_INCREASE));
|
||||
}
|
||||
if (totalRule != null && 1 == totalRule.getY2yValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544741, "同比周期(求和)"), k + UD + SUM + P_SAME));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544742, "求和同比差值"), k + UD + SUM + P_Y2Y_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544743, "求和同比增幅"), 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(),0, "本周期(平均值)"), k + UD + AVG + P_NOW));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544744, "本周期(平均值)"), k + UD + AVG + P_NOW));
|
||||
}
|
||||
if (avgRule != null && 1 == avgRule.getRatioValue()) {
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(平均值)"), k + UD + AVG + P_RATIO));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544745, "本周期占比(平均值)"), k + UD + AVG + P_RATIO));
|
||||
}
|
||||
if (avgRule != null && 1 == avgRule.getM2mValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544746, "上周期(平均值)"), k + UD + AVG + P_LAST));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544747, "平均值环比差值"), k + UD + AVG + P_M2M_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544748, "平均值环比增幅"), k + UD + AVG + P_M2M_INCREASE));
|
||||
}
|
||||
if (avgRule != null && 1 == avgRule.getY2yValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544749, "同比周期(平均值)"), k + UD + AVG + P_SAME));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544750, "平均值同比差值"), k + UD + AVG + P_Y2Y_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544751, "平均值同比增幅"), 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(),0, "本周期(最大值)"), k + UD + MAX + P_NOW));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544752, "本周期(最大值)"), k + UD + MAX + P_NOW));
|
||||
}
|
||||
if (maxRule != null && 1 == maxRule.getRatioValue()) {
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(最大值)"), k + UD + MAX + P_RATIO));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544753, "本周期占比(最大值)"), k + UD + MAX + P_RATIO));
|
||||
}
|
||||
if (maxRule != null && 1 == maxRule.getM2mValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544754, "上周期(最大值)"), k + UD + MAX + P_LAST));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544756, "最大值环比差值"), k + UD + MAX + P_M2M_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544755, "最大值环比增幅"), k + UD + MAX + P_M2M_INCREASE));
|
||||
}
|
||||
if (maxRule != null && 1 == maxRule.getY2yValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544758, "同比周期(最大值)"), k + UD + MAX + P_SAME));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544757, "最大值同比差值"), k + UD + MAX + P_Y2Y_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544759, "最大值同比增幅"), 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(),0, "本周期(最小值)"), k + UD + MIN + P_NOW));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544760, "本周期(最小值)"), k + UD + MIN + P_NOW));
|
||||
}
|
||||
if (minRule != null && 1 == minRule.getRatioValue()) {
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(最小值)"), k + UD + MIN + P_RATIO));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544761, "本周期占比(最小值)"), k + UD + MIN + P_RATIO));
|
||||
}
|
||||
if (minRule != null && 1 == minRule.getM2mValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544762, "上周期(最小值)"), k + UD + MIN + P_LAST));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544763, "最小值环比差值"), k + UD + MIN + P_M2M_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544764, "最小值环比增幅"), k + UD + MIN + P_M2M_INCREASE));
|
||||
}
|
||||
if (minRule != null && 1 == minRule.getY2yValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544765, "同比周期(最小值)"), k + UD + MIN + P_SAME));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544766, "最小值同比差值"), k + UD + MIN + P_Y2Y_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544767, "最小值同比增幅"), 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(),0, "本周期(中位数)"), k + UD + MEDIAN + P_NOW));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544768, "本周期(中位数)"), k + UD + MEDIAN + P_NOW));
|
||||
}
|
||||
if (medianRule != null && 1 == medianRule.getRatioValue()) {
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "本周期占比(中位数)"), k + UD + MEDIAN + P_RATIO));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544769, "本周期占比(中位数)"), k + UD + MEDIAN + P_RATIO));
|
||||
}
|
||||
if (medianRule != null && 1 == medianRule.getM2mValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544770, "上周期(中位数)"), k + UD + MEDIAN + P_LAST));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544771, "中位数环比差值"), k + UD + MEDIAN + P_M2M_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544772, "中位数环比增幅"), k + UD + MEDIAN + P_M2M_INCREASE));
|
||||
}
|
||||
if (medianRule != null && 1 == medianRule.getY2yValue()) {
|
||||
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));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544773, "同比周期(中位数)"), k + UD + MEDIAN + P_SAME));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544774, "中位数同比差值"), k + UD + MEDIAN + P_Y2Y_D_VALUE));
|
||||
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(user.getLanguage(),544775, "中位数同比增幅"), k + UD + MEDIAN + P_Y2Y_INCREASE));
|
||||
}
|
||||
weaTableColumn.setChildren(children);
|
||||
result.add(weaTableColumn);
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public class SalaryBillItemNameServiceImpl extends Service implements SalaryBill
|
|||
Long salaryTemplateId = templateIdList.get(0);
|
||||
SalaryTemplatePO salaryTemplatePO = getSalaryTemplateService(user).getById(salaryTemplateId);
|
||||
if(Objects.isNull(salaryTemplatePO)){
|
||||
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),0,"工资单模板不存在或已被删除"));
|
||||
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),544776,"工资单模板不存在或已被删除"));
|
||||
}
|
||||
List<SalaryBillItemNamePO> needInsertList = new ArrayList<>();
|
||||
List<SalaryBillItemNamePO> needUpdateList = new ArrayList<>();
|
||||
|
|
|
|||
Loading…
Reference in New Issue