From 5b6b720d7d85b32192907321d4e4afee94cbdfff Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 8 Mar 2019 10:31:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=20?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=87=8D=E7=BD=AE=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 4d003e2..31dda7a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1048,8 +1048,6 @@ public class ImppEnumUtil { } } - //messageReceiverType - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { INTERNAL(1, "内部人员接收"), From 1bdc307a1b5ea78f6fb8d5a8c568d8073516785c Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 8 Mar 2019 17:12:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index a003e66..cc02e4e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -439,7 +439,7 @@ public class BlockReportEnumUtil { }else if(type.equals(TEMPLATE_TYPE.ECHARTS_BAR)){ // 饼图 只需要名称 和值 return new String[]{"name","value"}; }else if(type.equals(TEMPLATE_TYPE.ECHARTS_LINE)){ // 饼图 只需要名称 和值 - return new String[]{"name","value","xAxis"}; + return new String[]{"xAxis","name","value"}; }else if(type.equals(TEMPLATE_TYPE.ECHARTS_TREEMAP)){ // 饼图 只需要名称 和值 return new String[]{"name","value"}; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index f23b1c1..49b0c09 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -89,6 +89,11 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="聚合类型",example = "-1") private Integer aggregationType; + @Column(name="AGGREGATION_ID") + @ApiParam(value ="聚合类型",example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long aggregationId; + @Column(name="ATTR_SORT") @ApiParam(value ="字段排序") private Integer attrSort;