> salaryAcctResultValueMap) {
if (CollectionUtils.isEmpty(list)) {
return new ArrayList<>();
@@ -1021,6 +1172,26 @@ public class SalaryStatisticsReportBO {
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(174376, "中位数同比差值"), k + UD + MEDIAN + P_Y2Y_D_VALUE));
children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(174377, "中位数同比增幅"), k + UD + MEDIAN + P_Y2Y_INCREASE));
}
+ // 7.最新值children
+ SalaryStatisticsItemRuleDTO lastRule = JSON.parseObject(itemPO.getLastRule(), SalaryStatisticsItemRuleDTO.class);
+ if (lastRule != null && 1 == lastRule.getTotalValue()) {
+ children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(174246, "最新值"), k + UD + SalaryStatisticsItemStringRuleEnum.LAST.getValue() + P_NOW));
+ }
+ // 8.最旧值children
+ SalaryStatisticsItemRuleDTO oldRule = JSON.parseObject(itemPO.getOldRule(), SalaryStatisticsItemRuleDTO.class);
+ if (oldRule != null && 1 == oldRule.getTotalValue()) {
+ children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(174246, "最旧值"), k + UD + SalaryStatisticsItemStringRuleEnum.OLD.getValue() + P_NOW));
+ }
+ // 9.最频繁children
+ SalaryStatisticsItemRuleDTO frequentRule = JSON.parseObject(itemPO.getFrequentRule(), SalaryStatisticsItemRuleDTO.class);
+ if (frequentRule != null && 1 == frequentRule.getTotalValue()) {
+ children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(174246, "频繁出现"), k + UD + SalaryStatisticsItemStringRuleEnum.FREQUENT.getValue() + P_NOW));
+ }
+ // 10.平铺children
+ SalaryStatisticsItemRuleDTO tileRule = JSON.parseObject(itemPO.getTileRule(), SalaryStatisticsItemRuleDTO.class);
+ if (tileRule != null && 1 == tileRule.getTotalValue()) {
+ children.add(new WeaTableColumnGroup(COL_WIDTH, SalaryI18nUtil.getI18nLabel(174246, "平铺"), k + UD + SalaryStatisticsItemStringRuleEnum.TILE.getValue() + P_NOW));
+ }
weaTableColumn.setChildren(children);
result.add(weaTableColumn);
});
diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java
index c64881c59..02cce6b8b 100644
--- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java
+++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java
@@ -14,30 +14,29 @@ import java.math.BigDecimal;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-//"薪酬统计报表自定义统计项目规则")
public class SalaryStatisticsItemRuleDTO {
- //是否有合计列")
+ //是否有合计列。若是文本,代表是否显示
private Integer totalValue;
- //是否有占比列")
+ //是否有占比列
private Integer ratioValue;
- //是否有环比列")
+ //是否有环比列
private Integer m2mValue;
- //合计环比上限")
+ //合计环比上限
private BigDecimal m2mUpperLimit;
- //合计环比下限")
+ //合计环比下限
private BigDecimal m2mLowerLimit;
- //是否有同比列")
+ //是否有同比列
private Integer y2yValue;
- //合计同比上限")
+ //合计同比上限
private BigDecimal y2yUpperLimit;
- //合计同比下限")
+ //合计同比下限
private BigDecimal y2yLowerLimit;
}
diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java
index cc856e07f..933843736 100644
--- a/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java
+++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java
@@ -50,9 +50,20 @@ public class SalaryStatisticsItemSaveParam {
//中位数规则
private SalaryStatisticsItemRuleDTO medianRule;
-
+
+ //最近值
private SalaryStatisticsItemRuleDTO lastRule;
+ //最旧值
+ private SalaryStatisticsItemRuleDTO oldRule;
+
+ //频繁出现
+ private SalaryStatisticsItemRuleDTO frequentRule;
+
+ //平铺
+ private SalaryStatisticsItemRuleDTO tileRule;
+
+
//统计单位
private Integer unitType;
}
diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
index b7ac48bb1..bcf430d57 100644
--- a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
+++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
@@ -130,7 +130,7 @@ public class SalaryStatisticsItemPO implements Serializable {
/**
* 最近值
*
- * "able":"1", 是否使用
+ * "totalValue":"1", 是否使用
*/
private String lastRule;
@@ -138,7 +138,7 @@ public class SalaryStatisticsItemPO implements Serializable {
* 最早值
*
* {
- * "able":"1", 是否使用
+ * "totalValue":"1", 是否使用
* }
*/
private String oldRule;
@@ -147,7 +147,7 @@ public class SalaryStatisticsItemPO implements Serializable {
* 出现最多
*
* {
- * "able":"1", 是否使用
+ * "totalValue":"1", 是否使用
* }
*/
private String frequentRule;
@@ -156,7 +156,7 @@ public class SalaryStatisticsItemPO implements Serializable {
* 平铺
*
* {
- * "able":"1", 是否使用
+ * "totalValue":"1", 是否使用
* }
*/
private String tileRule;
diff --git a/src/com/engine/salary/report/enums/SalaryStatisticsItemStringRuleEnum.java b/src/com/engine/salary/report/enums/SalaryStatisticsItemStringRuleEnum.java
index 1356b639f..3ca0bdcff 100644
--- a/src/com/engine/salary/report/enums/SalaryStatisticsItemStringRuleEnum.java
+++ b/src/com/engine/salary/report/enums/SalaryStatisticsItemStringRuleEnum.java
@@ -9,7 +9,7 @@ public enum SalaryStatisticsItemStringRuleEnum implements BaseEnum {
LAST("last", "最近值", 83993),
OLD("old", "最早值", 83994),
- FREQUENT("frequent", "出现最多", 83994),
+ FREQUENT("frequent", "最频繁", 83994),
TILE("tile", "平铺", 83994),
;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
index 8c56dc7ef..6468f3f4b 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
@@ -116,6 +116,10 @@ public class SalaryStatisticsItemServiceImpl extends Service implements SalarySt
.maxRule(SalaryEntityUtil.toJSONString(saveParam.getMaxRule()))
.minRule(SalaryEntityUtil.toJSONString(saveParam.getMinRule()))
.medianRule(SalaryEntityUtil.toJSONString(saveParam.getMedianRule()))
+ .lastRule(SalaryEntityUtil.toJSONString(saveParam.getMedianRule()))
+ .oldRule(SalaryEntityUtil.toJSONString(saveParam.getMedianRule()))
+ .frequentRule(SalaryEntityUtil.toJSONString(saveParam.getMedianRule()))
+ .tileRule(SalaryEntityUtil.toJSONString(saveParam.getMedianRule()))
.indexValue(max + 1)
.statReportId(saveParam.getStatReportId())
.unitType(saveParam.getUnitType() == null ? UnitTypeEnum.YUAN.getValue() : saveParam.getUnitType())
@@ -149,6 +153,10 @@ public class SalaryStatisticsItemServiceImpl extends Service implements SalarySt
itemPO.setMaxRule(SalaryEntityUtil.toJSONString(saveParam.getMaxRule()));
itemPO.setMinRule(SalaryEntityUtil.toJSONString(saveParam.getMinRule()));
itemPO.setMedianRule(SalaryEntityUtil.toJSONString(saveParam.getMedianRule()));
+ itemPO.setLastRule(SalaryEntityUtil.toJSONString(saveParam.getLastRule()));
+ itemPO.setOldRule(SalaryEntityUtil.toJSONString(saveParam.getOldRule()));
+ itemPO.setFrequentRule(SalaryEntityUtil.toJSONString(saveParam.getFrequentRule()));
+ itemPO.setTileRule(SalaryEntityUtil.toJSONString(saveParam.getTileRule()));
}
getSalaryStatisticsItemMapper().updateIgnoreNull(itemPO);