From 735f3870fa332aa89e1ad5cbf01710d40528cb1a Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 15 Aug 2023 10:15:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=EF=BC=8C=E9=80=82=E9=85=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E8=A1=A8=E8=BF=B0=EF=BC=8C=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=88=86=E7=BB=84?= =?UTF-8?q?=E5=90=8D=E8=BD=AC=E4=B9=89=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/国际化sql/20230815094145.zip | Bin 0 -> 36945 bytes resource/国际化sql/20230815101045.zip | Bin 0 -> 3754 bytes .../entity/bo/SalaryStatisticsReportBO.java | 96 +++++++++--------- .../impl/SalaryBillItemNameServiceImpl.java | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 resource/国际化sql/20230815094145.zip create mode 100644 resource/国际化sql/20230815101045.zip diff --git a/resource/国际化sql/20230815094145.zip b/resource/国际化sql/20230815094145.zip new file mode 100644 index 0000000000000000000000000000000000000000..9db52f260b277675ce3dfaf01114a92fc163c8e2 GIT binary patch literal 36945 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 E0a9oU%m4rY literal 0 HcmV?d00001 diff --git a/resource/国际化sql/20230815101045.zip b/resource/国际化sql/20230815101045.zip new file mode 100644 index 0000000000000000000000000000000000000000..df0a1275dddae0ea833ceaca6b668569a32541b4 GIT binary patch literal 3754 zcmWIWW@Zs#;Nak3hzR5lXFvj4Kz3?!eolURrKNsxVNPj5dQoCZs=k*qh-YMAWNctz zXlh_&V5|q^7k}X_n}Je=cu0dG<03GXw$tX(VT@2YzAb*Xl>nM_?tRkPJiHtCtOXDpJesXh9${C9r- zKksb|kBPCdrDe3q?b!QV;=}{l>hCejP80+LL@bc3dvo&TeFf+3^L7+``J>d;v(3f$ z*O#`x@4v}d|D7S^tjlwOXYZbz-;08yw+BB8O7{NZVDY#3^~2Ba``#=+v9v8hNb;OY zo9WeH#g{_qdYPKjHH=UC>~LvkKKXK5#$->AZAWH#daY8u&J&h-=7y9F;Fm6-?&03 zhtKfWPABFV8Rrkta&M%XF669E$Vy7e%UdV#?xEC^RTHMqn9U^;Y+w5I$ZPNLZ#fo! zUVLFIopA8UjO>)Wq^`7gUqzqaf4hJ0PyL-~Qqd9;GZxOQeDG~vvO;nBo4ds`g*H1r zOlVB|wo!d~ee;<+RgVr`{M@Z!cvI-?lgrZI_TMgk^Cg+<%oYO&+2ulUE> ze*AT5s;xAiz13bv*$h3)V^ZM6Uky+E%O*k+zZ)d+-vB560~rAdz{Fn*PW;Ny#LvY8 zO#DCKiN8h}nD~44KokGu_g=}~CGY3|+xhjw&vN%~!4JHgbxv|kToK@Vbk-?Nztu-( zdU*w@o^sg~q;*lzA<0SgR?MQynj6)G=KFM-Ol%49+9Lf?EeIU;>EY-0DgeX&4BoKE zRptb^Q!m`1>3-ugV8G9V1bpj;JZQj+u>%8s3o!wIca~0Y?-^g8i#~hzJ^Hiz?{@S5 zs^?vjxtW=bO@#UH+$-iudDXYKT5oc`kp_#-1s}U_Prl?&=#2J{v8bvO{P`?u(ah?q z!~e>w`{vg9Z0i(b%TSAp+g5vV<=WdP%NB1`-F4sp|DCEIe|9VXK3Tq4aoQIaf8P~t zNxt`{EDL-6Xfkpdh(32MQd!Rud`{45>P|)wk8}zu6d~gW$!hN)wC9-Yf9y}W8 zG;7=7O6e}Xqk&FwpffUwFd*9T$c;@Jk1Ska-blA+r+i*oU z9=VYKYK9@e4<_u!<8G9pn~hu%q6SF`3wE=yH#*SGMK0w*)hGhI0hasNf&^!!if%OS xSWIWfZZ!5vgLrfAa9}qVd$~xwxq)2R&BdPe1H4(;K*7iXgy(<}e~cT%0{~Adl*Rx6 literal 0 HcmV?d00001 diff --git a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java index 1beb9c777..23bb3f82f 100644 --- a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java +++ b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java @@ -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); diff --git a/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java index dad26bc8b..170390108 100644 --- a/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java @@ -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 needInsertList = new ArrayList<>(); List needUpdateList = new ArrayList<>();