diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java index 50648f9..ff730f1 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java @@ -39,7 +39,7 @@ public class BrRefReportTypeset extends BaseBean { @ApiParam(value = "报表名称") private String reportNameRdd; - @Column(name = "REPORT_Typeset_TYPE") + @Column(name = "REPORT_TYPESET_TYPE") @ApiParam(value = "报表列类型") private Integer reportTypesetType; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java index 7cffe53..a88c054 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java @@ -42,6 +42,15 @@ public class BrReport extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; + //get单独处理 + public Long getLayoutId() { + if(layoutId != null) { + return layoutId.longValue(); + }else{ + return layoutId; + } + } + @Column(name="LAYOUT_NAME_RDD") @ApiParam(value ="布局名称") private String layoutNameRdd;