From e35113c51901f72c31f90c4eeaaebfbcb78ba2be Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 23 Jan 2019 12:00:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8E=92=E7=89=88?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockReportEnumUtil.java | 40 ++++++++++++++ .../cn/estsh/i3plus/pojo/report/bean/BrLayout.java | 14 ++--- .../i3plus/pojo/report/bean/BrLayoutColumn.java | 4 +- .../estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 8 +-- .../pojo/report/bean/BrRefReportTemplate.java | 64 ---------------------- ...fReportElement.java => BrRefReportTypeset.java} | 40 +++++--------- .../i3plus/pojo/report/bean/BrReportTemplate.java | 2 +- .../repository/BrRefReportTemplateRepository.java | 14 ----- ...tory.java => BrRefReportTypesetRepository.java} | 4 +- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 21 ++++++- 10 files changed, 88 insertions(+), 123 deletions(-) delete mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTemplate.java rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/{BrRefReportElement.java => BrRefReportTypeset.java} (59%) delete mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTemplateRepository.java rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/{BrRefReportElementRepository.java => BrRefReportTypesetRepository.java} (58%) 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 4a09da5..894e9cd 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 @@ -571,4 +571,44 @@ public class BlockReportEnumUtil { } } + /** + * 报表排版枚举 + * ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REPORT_TYPESET_TYPE{ + + ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + + private int value; + private String description; + + REPORT_TYPESET_TYPE() { + } + + REPORT_TYPESET_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java index 87bf4b3..9f80884 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java @@ -42,17 +42,17 @@ public class BrLayout extends BaseBean { @ApiParam(value ="布局高度") private Double layoutHeight; - @Column(name="ROW_COUNT") + @Column(name="LAYOUT_ROW_COUNT") @ApiParam(value ="行数") - private Integer rowCount; + private Integer layoutRowCount; - @Column(name="COLUMN_COUNT") + @Column(name="LAYOUT_COLUMN_COUNT") @ApiParam(value ="列数") - private Integer columnCount; + private Integer layoutColumnCount; - @Column(name="SEQ") - @ApiParam(value ="排序") - private Integer seq; + @Column(name="LAYOUT_REPORT_COUNT") + @ApiParam(value ="引用报表数量") + private Integer layoutReportCount; @Column(name="LAYOUT_HTML",columnDefinition = "TEXT") @ApiParam(value ="布局html") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index 9ff426f..cb924bc 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -62,9 +62,9 @@ public class BrLayoutColumn extends BaseBean { @ApiParam(value ="列样式") private String columnStyle; - @Column(name="SEQ") + @Column(name="COLUMN_SEQ") @ApiParam(value ="排序") - private Integer seq; + private Integer columnSeq; @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT") @ApiParam(value ="列描述") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index f380477..ab8d365 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -45,11 +45,11 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="行高") private Integer rowHeight; - @Column(name="SEQ") + @Column(name="ROW_SEQ") @ApiParam(value ="排序") - private Integer seq; + private Integer rowSeq; - @Column(name="ROW_STYLE") + @Column(name="ROW_STYLE",columnDefinition = "TEXT") @ApiParam(value ="行样式") private String rowStyle; @@ -57,7 +57,7 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="行所关联列数") private Integer rowColNum; - @Column(name="ROW_HTML") + @Column(name="ROW_HTML",columnDefinition = "TEXT") @ApiParam(value ="行html") private String rowHtml; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTemplate.java deleted file mode 100644 index d213c6d..0000000 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTemplate.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; - -/** - * @Description : 报表模板和报表关联表，多对多 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-25 19:54 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_REPORT_TEMPLATE") -@Api(value="报表模板&报表",description = "报表模板和报表的关联表 * -》 *") -public class BrRefReportTemplate extends BaseBean { - - @Column(name="REPORT_ID") - @ApiParam(value ="报表主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long reportId; - - @Column(name = "REPORT_NAME_RDD") - @ApiParam(value = "报表名称") - private String reportNameRdd; - - @Column(name="LAYOUT_COLUMN_ID") - @ApiParam(value ="列主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutColumnId; - - @Column(name="REPORT_TEMPLATE_ID") - @ApiParam(value ="报表模板主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long reportTemplateId; - - @Column(name="REPORT_TEMPLATE_NAME_RDD") - @ApiParam(value ="报表模板名称") - private String reportTemplateNameRdd; - - @Column(name="REPORT_TEMPLATE_HTML_RDD") - @ApiParam(value ="报表模板html") - private String reportTemplateHtmlRdd; - - @Transient - @ApiParam(value = "报表模板") - private BrReportTemplate brReportTemplate; -} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java similarity index 59% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportElement.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java index dfae91a..dd14e47 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java @@ -13,8 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; /** * @Description : 元素和报表关联表，多对多 @@ -28,9 +26,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_REPORT_ELEMENT") -@Api(value="元素&报表",description = "元素和报表的关联表 * -》 *") -public class BrRefReportElement extends BaseBean { +@Table(name="BR_REF_REPORT_TYPESET") +@Api(value="元素&模板&报表",description = "报表，元素和模板的关联表 * -》 *") +public class BrRefReportTypeset extends BaseBean { @Column(name = "REPORT_ID") @ApiParam(value = "报表主键") @@ -41,30 +39,20 @@ public class BrRefReportElement extends BaseBean { @ApiParam(value = "报表名称") private String reportNameRdd; + @Column(name = "REPORT_Typeset_TYPE") + @ApiParam(value = "报表列类型") + private Integer reportTypesetType; + @Column(name = "LAYOUT_COLUMN_ID") - @ApiParam(value = "列主键") + @ApiParam(value = "布局列主键") @JsonSerialize(using = ToStringSerializer.class) private Long layoutColumnId; - @Column(name = "ELEMENT_ID") - @ApiParam(value = "元素主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long elementId; - - @Column(name = "ELEMENT_NAME_RDD") - @ApiParam(value = "元素名称") - private String elementNameRdd; - - @Column(name = "ELEMENT_HTML_RDD",columnDefinition = "TEXT") - @ApiParam(value = "元素html") + /** + * 关联id，元素或模板id + */ + @Column(name = "REL_ID") + @ApiParam(value = "关联id") @JsonSerialize(using = ToStringSerializer.class) - private String elementHtmlRdd; - - @Transient - @ApiParam(value = "报表实例") - private BrReport brReport; - - @Transient - @ApiParam(value = "报表元素") - private BrElement brElement; + private Long contentId; } \ No newline at end of file diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java index 65480b8..8c3ead4 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java @@ -48,7 +48,7 @@ public class BrReportTemplate extends BaseBean { @Transient @ApiParam(value ="报表模板列表") - private List brReportTemplateDetailList; + private List brRefReportTypesetList; @Transient @ApiParam(value ="元素所在的列") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTemplateRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTemplateRepository.java deleted file mode 100644 index 1b22193..0000000 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTemplateRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrRefReportTemplate; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-26 20:23 - * @Modify: - **/ -public interface BrRefReportTemplateRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportElementRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java similarity index 58% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportElementRepository.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java index 90771e4..15695f9 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportElementRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.report.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrRefReportElement; +import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrRefReportElement; * @CreateDate : 2018-12-26 20:23 * @Modify: **/ -public interface BrRefReportElementRepository extends BaseRepository { +public interface BrRefReportTypesetRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 0bcd1d9..716a9a6 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.report.bean.BrElement; import cn.estsh.i3plus.pojo.report.bean.BrLayout; import cn.estsh.i3plus.pojo.report.bean.BrMenu; +import cn.estsh.i3plus.pojo.report.bean.BrReport; import org.apache.commons.lang3.StringUtils; /** @@ -103,7 +104,7 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(rowId,"layoutRowId",result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"seq"},result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"columnSeq"},result); return result.toString(); } @@ -113,12 +114,26 @@ public class ReportHqlPack { * @param layoutId * @return */ - public static String packHqlBrLayoutColumnByLayoutIdSortBySeq(Long layoutId){ + public static String packHqlBrLayoutRowByLayoutIdSortBySeq(Long layoutId){ StringBuffer result = new StringBuffer(); // 查询参数封装 HqlPack.getNumEqualPack(layoutId,"layoutId",result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"seq"},result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"rowSeq"},result); + + return result.toString(); + } + + /** + * 报表查询 + * @param brReport + * @return + */ + public static String packHqlBrReport(BrReport brReport){ + StringBuffer result = new StringBuffer(); + + // 查询参数封装 + HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result); return result.toString(); } From d0cee703feb9be05e30f6cef56f4fe7bfd1cdd70 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sun, 27 Jan 2019 11:51:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/MailConfig.java | 34 ++++++++++++++++++++++ .../i3plus/pojo/report/bean/BrLayoutColumn.java | 2 +- .../pojo/report/bean/BrRefReportTypeset.java | 17 +++++++++-- .../cn/estsh/i3plus/pojo/report/bean/BrReport.java | 30 ++++++++++++++++--- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 5 ++-- 5 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java new file mode 100644 index 0000000..ba018d1 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 邮件配置信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-01-27 10:53 + * @Modify: + **/ +@Data +public class MailConfig { + + @ApiParam(value = "邮箱服务器") + private String mailHost; + + @ApiParam(value = "邮箱端口") + private Integer mailPort; + + @ApiParam(value = "邮箱账号") + private String mailUser; + + @ApiParam(value = "邮箱密码") + private String mailPassword; + + @ApiParam(value = "发信昵称") + private String mailNick; + + @ApiParam(value = "测试收信人") + private String testTo; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index cb924bc..8cc144b 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -70,7 +70,7 @@ public class BrLayoutColumn extends BaseBean { @ApiParam(value ="列描述") private String columnDescription; - @Column(name="COLUMN_HTML") + @Column(name="COLUMN_HTML",columnDefinition = "TEXT") @ApiParam(value ="列html") private String columnHtml; } 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 dd14e47..50648f9 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 @@ -51,8 +51,19 @@ public class BrRefReportTypeset extends BaseBean { /** * 关联id，元素或模板id */ - @Column(name = "REL_ID") + @Column(name = "REF_ID") @ApiParam(value = "关联id") - @JsonSerialize(using = ToStringSerializer.class) - private Long contentId; + @JsonSerialize (using = ToStringSerializer.class) + private Long refId; + + /** + * 关联元素或模板html + */ + @Column(name = "REF_HTML") + @ApiParam(value = "关联对象html") + private String refHtml; + + @Column(name = "TYPESET_DESCRIPTION",columnDefinition = "TEXT") + @ApiParam(value ="排版描述") + private String typesetDescription; } \ No newline at end of file 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 79d54e2..7cffe53 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 报表实例 @@ -39,16 +42,35 @@ public class BrReport extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; - @Column(name="LAYOUT_ID_RDD") + @Column(name="LAYOUT_NAME_RDD") @ApiParam(value ="布局名称") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutNameRdd; + private String layoutNameRdd; @Column(name="LAYOUT_HTML") - @ApiParam(value ="布局html") + @ApiParam(value ="报表html") private String reportHtml; @Column(name="SEQ") @ApiParam(value ="排序") private Integer seq; + + @Column(name="TEMPLATE_NUM") + @ApiParam(value ="模板数量") + private Integer templateNum; + + @Column(name="ELEMENT_NUM") + @ApiParam(value ="元素数量") + private Integer elementNum; + + @Column(name = "REPORT_DESCRIPTION",columnDefinition = "TEXT") + @ApiParam(value ="报表描述") + private String reportDescription; + + @Transient + @ApiParam(value = "报表关联布局对象") + private BrLayout brLayout; + + @Transient + @ApiParam(value = "报表排版关系") + private List brRefReportTypesetList; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 716a9a6..d4350dc 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -104,7 +104,7 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(rowId,"layoutRowId",result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"columnSeq"},result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSeq","modifyDatetime"},result); return result.toString(); } @@ -119,7 +119,7 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(layoutId,"layoutId",result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"rowSeq"},result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSeq","modifyDatetime"},result); return result.toString(); } @@ -134,6 +134,7 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result); + HqlPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result); return result.toString(); } From 40d37ed5c95027ddf21602b6c42e14ec89279b7b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 28 Jan 2019 13:13:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=20=E6=8A=A5=E8=A1=A8=E5=85=83?= =?UTF-8?q?=E7=B4=A0=20=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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;