I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自定义报表 布局,元素,报表 功能优化完成

Browse Source
yun-zuoyi
wei.peng 5 years ago
parent 549f2ff797
commit c8c7c73336
14 changed files with 380 additions and 279 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
Unescape Escape View File

@ -785,20 +785,20 @@ public class BlockReportEnumUtil {
/** /**
* 报表排版枚举 * 报表排版枚举
* ELEMENT(1,"元素"),TEMPLATE(2,"模板"); * ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REPORT_TYPESET_TYPE{ public enum REPORT_REF_TYPE{
ELEMENT(1,"元素"),TEMPLATE(2,"模板"); ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
private int value; private int value;
private String description; private String description;
REPORT_TYPESET_TYPE() { REPORT_REF_TYPE() {
} }
REPORT_TYPESET_TYPE(int value, String description) { REPORT_REF_TYPE(int value, String description) {
this.value = value; this.value = value;
this.description = description; this.description = description;
} }

37
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java
Unescape Escape View File

@ -0,0 +1,37 @@
package cn.estsh.i3plus.pojo.model.report;
import cn.estsh.i3plus.pojo.report.bean.BrElement;
import cn.estsh.i3plus.pojo.report.bean.BrLayout;
import cn.estsh.i3plus.pojo.report.bean.BrRefReport;
import cn.estsh.i3plus.pojo.report.bean.BrReport;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-3-24 下午3:28
* @Modify:
**/
@Data
public class BrDynamicPageModel {
@ApiParam(value ="报表信息")
private BrReport report;
@ApiParam(value ="布局信息")
private BrLayout layout;
@ApiParam(value = "报表排版关系")
private List<BrRefReport> refReportList;
@ApiParam(value ="页面元素内容")
private List<BrElement> elementList;
@ApiParam(value ="页面元素内容")
private List<TemplateModel> templateModelList;
}

33
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java
Unescape Escape View File

@ -28,41 +28,16 @@ import java.util.List;
@Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1") @Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1")
public class BrLayout extends BaseBean { public class BrLayout extends BaseBean {
private static final long serialVersionUID = -3790563562881742852L;
@Column(name="LAYOUT_NAME") @Column(name="LAYOUT_NAME")
@ApiParam(value ="名称") @ApiParam(value ="布局名称")
private String layoutName; private String layoutName;
@Column(name="LAYOUT_WIDTH")
@ApiParam(value ="布局宽度")
private Double layoutWidth;
@Column(name="LAYOUT_HEIGHT")
@ApiParam(value ="布局高度")
private Double layoutHeight;
@Column(name="LAYOUT_ROW_COUNT")
@ApiParam(value ="行数")
private Integer layoutRowCount;
@Column(name="LAYOUT_COLUMN_COUNT")
@ApiParam(value ="列数")
private Integer layoutColumnCount;
@Column(name="LAYOUT_REPORT_COUNT")
@ApiParam(value ="引用报表数量")
private Integer layoutReportCount;
// @Lob
// @Column(name="LAYOUT_HTML")
// @ApiParam(value ="布局html")
// private String layoutHtml;
//
// @Lob
@Column(name = "LAYOUT_DESCRIPTION") @Column(name = "LAYOUT_DESCRIPTION")
@ApiParam(value ="布局描述") @ApiParam(value ="布局描述")
private String layoutDescription; private String layoutDescription;
@Transient @Transient
@ApiParam(value ="模板行列表") @ApiParam(value ="行所包含的元素")
private List<BrLayoutRow> brLayoutRows; private List<BrLayoutElement> elementList;
} }

160
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java
Unescape Escape View File

@ -1,80 +1,80 @@
package cn.estsh.i3plus.pojo.report.bean; //package cn.estsh.i3plus.pojo.report.bean;
//
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; //import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; //import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; //import io.swagger.annotations.ApiParam;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; //import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; //import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type; //import org.hibernate.annotations.Type;
//
import javax.persistence.*; //import javax.persistence.*;
import java.util.List; //import java.util.List;
//
/** ///**
* @Description : 自定义报表布局 // * @Description : 自定义报表布局
* @Reference : // * @Reference :
* @Author : alwaysfrin // * @Author : alwaysfrin
* @CreateDate : 2018-12-25 19:54 // * @CreateDate : 2018-12-25 19:54
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@Entity //@Entity
@DynamicInsert //@DynamicInsert
@DynamicUpdate //@DynamicUpdate
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@Table(name="BR_LAYOUT_COLUMN") //@Table(name="BR_LAYOUT_COLUMN")
@Api(value="自定义报表布局-列",description = "一行包含多列") //@Api(value="自定义报表布局-列",description = "一行包含多列")
public class BrLayoutColumn extends BaseBean { //public class BrLayoutColumn extends BaseBean {
//
@Column(name="LAYOUT_ID") // @Column(name="LAYOUT_ID")
@ApiParam(value ="布局主键") // @ApiParam(value ="布局主键")
@JsonSerialize(using = ToStringSerializer.class) // @JsonSerialize(using = ToStringSerializer.class)
private Long layoutId; // private Long layoutId;
//
@Column(name="LAYOUT_ROW_ID") // @Column(name="LAYOUT_ROW_ID")
@ApiParam(value ="行主键") // @ApiParam(value ="行主键")
@JsonSerialize(using = ToStringSerializer.class) // @JsonSerialize(using = ToStringSerializer.class)
private Long layoutRowId; // private Long layoutRowId;
//
@Column(name="COLUMN_COLSPAN") // @Column(name="COLUMN_COLSPAN")
@ApiParam(value ="跨列数") // @ApiParam(value ="跨列数")
private Integer columnColspan; // private Integer columnColspan;
//
@Column(name="COLUMN_ROWSPAN") // @Column(name="COLUMN_ROWSPAN")
@ApiParam(value ="跨行数") // @ApiParam(value ="跨行数")
private Integer columnRowspan; // private Integer columnRowspan;
//
@Column(name="COLUMN_WIDTH") // @Column(name="COLUMN_WIDTH")
@ApiParam(value ="列宽") // @ApiParam(value ="列宽")
private Integer columnWidth; // private Integer columnWidth;
//
@Column(name="COLUMN_HEIGHT") // @Column(name="COLUMN_HEIGHT")
@ApiParam(value ="列高") // @ApiParam(value ="列高")
private Integer columnHeight; // private Integer columnHeight;
//
@Column(name="COLUMN_STYLE") // @Column(name="COLUMN_STYLE")
@ApiParam(value ="列样式") // @ApiParam(value ="列样式")
private String columnStyle; // private String columnStyle;
//
@Column(name="COLUMN_SEQ") // @Column(name="COLUMN_SEQ")
@ApiParam(value ="序列") // @ApiParam(value ="序列")
private Integer columnSeq; // private Integer columnSeq;
//
@Column(name="COLUMN_SORT") // @Column(name="COLUMN_SORT")
@ApiParam(value ="排序，降序") // @ApiParam(value ="排序，降序")
private Integer columnSort; // private Integer columnSort;
//
// @Lob //// @Lob
@Column(name = "COLUMN_DESCRIPTION") // @Column(name = "COLUMN_DESCRIPTION")
@ApiParam(value ="列描述") // @ApiParam(value ="列描述")
private String columnDescription; // private String columnDescription;
//
// @Lob //// @Lob
// @Column(name="COLUMN_HTML") //// @Column(name="COLUMN_HTML")
// @ApiParam(value ="列html") //// @ApiParam(value ="列html")
// private String columnHtml; //// private String columnHtml;
} //}

76
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java
Unescape Escape View File

@ -0,0 +1,76 @@
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;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-3-24 下午2:39
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BR_LAYOUT_ELEMENT")
@Api(value = "自定义报表布局元素")
public class BrLayoutElement extends BaseBean {
@Column(name = "LAYOUT_ID")
@ApiParam(value = "布局主键")
@JsonSerialize(using = ToStringSerializer.class)
private Long layoutId;
@Column(name = "PARENT_ID")
@ApiParam(value = "父节点主键")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@Column(name = "ELEMENT_TEXT")
@ApiParam(value ="元素描述")
private String elementText;
@Column(name="ELEMENT_SEQ")
@ApiParam(value ="序列")
private Integer elementSeq = 0;
@Column(name="ELEMENT_WIDTH")
@ApiParam(value ="列宽")
private Integer elementWidth;
@Column(name="ELEMENT_HEIGHT")
@ApiParam(value ="列高")
private Integer elementHeight;
@Column(name="ELEMENT_STYLE")
@ApiParam(value ="列样式")
private String elementStyle;
@Column(name="ELEMENT_CSS_CLASS")
@ApiParam(value ="列样式")
private String elementCssClass;
@Column(name = "ELEMENT_DESCRIPTION")
@ApiParam(value ="元素描述")
private String elementDescription;
@Transient
@ApiParam(value ="行所包含的元素")
private List<BrLayoutElement> elementList;
}

132
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java
Unescape Escape View File

@ -1,67 +1,67 @@
package cn.estsh.i3plus.pojo.report.bean; //package cn.estsh.i3plus.pojo.report.bean;
//
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; //import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; //import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; //import io.swagger.annotations.ApiParam;
import lombok.Data; //import lombok.Data;
import lombok.EqualsAndHashCode; //import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; //import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; //import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type; //import org.hibernate.annotations.Type;
//
import javax.persistence.*; //import javax.persistence.*;
import java.util.List; //import java.util.List;
//
/** ///**
* @Description : 自定义报表布局 // * @Description : 自定义报表布局
* @Reference : // * @Reference :
* @Author : alwaysfrin // * @Author : alwaysfrin
* @CreateDate : 2018-12-25 19:54 // * @CreateDate : 2018-12-25 19:54
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@Entity //@Entity
@DynamicInsert //@DynamicInsert
@DynamicUpdate //@DynamicUpdate
@EqualsAndHashCode(callSuper = true) //@EqualsAndHashCode(callSuper = true)
@Table(name="BR_LAYOUT_ROW") //@Table(name="BR_LAYOUT_ROW")
@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列") //@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列")
public class BrLayoutRow extends BaseBean { //public class BrLayoutRow extends BaseBean {
//
@Column(name="LAYOUT_ID") // @Column(name="LAYOUT_ID")
@ApiParam(value ="布局主键") // @ApiParam(value ="布局主键")
@JsonSerialize(using = ToStringSerializer.class) // @JsonSerialize(using = ToStringSerializer.class)
private Long layoutId; // private Long layoutId;
//
@Column(name="ROW_WIDTH") // @Column(name="ROW_WIDTH")
@ApiParam(value ="行宽") // @ApiParam(value ="行宽")
private Integer rowWidth; // private Integer rowWidth;
//
@Column(name="ROW_HEIGHT") // @Column(name="ROW_HEIGHT")
@ApiParam(value ="行高") // @ApiParam(value ="行高")
private Integer rowHeight; // private Integer rowHeight;
//
@Column(name="ROW_SORT") // @Column(name="ROW_SORT")
@ApiParam(value ="排序") // @ApiParam(value ="排序")
private Integer rowSort; // private Integer rowSort;
//
@Lob
@Column(name="ROW_STYLE")
@ApiParam(value ="行样式")
private String rowStyle;
@Column(name="ROW_COL_NUM")
@ApiParam(value ="行所关联列数")
private Integer rowColNum;
// @Lob // @Lob
// @Column(name="ROW_HTML") // @Column(name="ROW_STYLE")
// @ApiParam(value ="行html") // @ApiParam(value ="行样式")
// private String rowHtml; // private String rowStyle;
//
@Transient // @Column(name="ROW_COL_NUM")
@ApiParam(value ="行所包含的列") // @ApiParam(value ="行所关联列数")
private List<BrLayoutColumn> brLayoutColumns; // private Integer rowColNum;
} //
//// @Lob
//// @Column(name="ROW_HTML")
//// @ApiParam(value ="行html")
//// private String rowHtml;
//
// @Transient
// @ApiParam(value ="行所包含的列")
// private List<BrLayoutColumn> brLayoutColumns;
//}

50
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java → modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java
Unescape Escape View File

@ -12,8 +12,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/** /**
* @Description : 元素和报表关联表，多对多 * @Description : 元素和报表关联表，多对多
@ -27,46 +28,41 @@ import javax.persistence.Table;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name="BR_REF_REPORT_TYPESET") @Table(name="BR_REF_REPORT")
@Api(value="元素&模板&报表",description = "报表，元素和模板的关联表 * -》 *") @Api(value="元素&模板&报表",description = "报表，元素和模板的关联表 * -》 *")
public class BrRefReportTypeset extends BaseBean { public class BrRefReport extends BaseBean {
private static final long serialVersionUID = 7860212457391123584L;
@Column(name = "REPORT_ID") @Column(name = "REPORT_ID")
@ApiParam(value = "报表主键") @ApiParam(value = "报表主键")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long reportId; private Long reportId;
@Column(name = "REPORT_NAME_RDD") @Column(name="LAYOUT_ID")
@ApiParam(value = "报表名称") @ApiParam(value ="布局主键")
private String reportNameRdd; @JsonSerialize(using = ToStringSerializer.class)
private Long layoutId;
@Column(name = "REPORT_TYPESET_TYPE")
@ApiParam(value = "报表列类型")
private Integer reportTypesetType;
@Column(name = "LAYOUT_COLUMN_ID") @Column(name = "LAYOUT_ELEMENT_ID")
@ApiParam(value = "布局列主键") @ApiParam(value = "布局元素主键")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long layoutColumnId; private Long layoutElementId;
@Column(name="REF_TYPE_ID")
@ApiParam(value ="序列")
private Integer refTypeId;
/**
* 关联id，元素或模板id
*/
@Column(name = "REF_ID") @Column(name = "REF_ID")
@ApiParam(value = "关联id") @ApiParam(value = "关联id")
@JsonSerialize (using = ToStringSerializer.class) @JsonSerialize (using = ToStringSerializer.class)
private Long refId; private Long refId;
// /** @Column(name = "REF_NAME_RDD")
// * 关联元素或模板html @ApiParam(value = "关联对象名称")
// */ private String refNameRdd;
// @Lob
// @Column(name = "REF_HTML") @Transient
// @ApiParam(value = "关联对象html") @ApiParam(value = "关联对象")
// private String refHtml; private Object refObject;
@Lob
@Column(name = "TYPESET_DESCRIPTION")
@ApiParam(value ="排版描述")
private String typesetDescription;
} }

39
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java
Unescape Escape View File

@ -10,7 +10,10 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List; import java.util.List;
/** /**
@ -29,6 +32,7 @@ import java.util.List;
@Api(value="自定义报表",description = "所有报表实例，生成最后的报表") @Api(value="自定义报表",description = "所有报表实例，生成最后的报表")
public class BrReport extends BaseBean { public class BrReport extends BaseBean {
private static final long serialVersionUID = 1987404021291348713L;
@Column(name="REPORT_NAME") @Column(name="REPORT_NAME")
@ApiParam(value ="报表名称") @ApiParam(value ="报表名称")
private String reportName; private String reportName;
@ -38,46 +42,19 @@ public class BrReport extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long layoutId; private Long layoutId;
//get单独处理
public Long getLayoutId() {
if(layoutId != null) {
return layoutId.longValue();
}else{
return layoutId;
}
}
@Column(name="LAYOUT_NAME_RDD") @Column(name="LAYOUT_NAME_RDD")
@ApiParam(value ="布局名称") @ApiParam(value ="布局名称")
private String layoutNameRdd; private String layoutNameRdd;
@Lob
@Column(name="LAYOUT_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;
@Lob
@Column(name = "REPORT_DESCRIPTION") @Column(name = "REPORT_DESCRIPTION")
@ApiParam(value ="报表描述") @ApiParam(value ="报表描述")
private String reportDescription; private String reportDescription;
@Transient @Transient
@ApiParam(value = "报表关联布局对象") @ApiParam(value = "报表排版关系")
private BrLayout brLayout; private BrLayout layout;
@Transient @Transient
@ApiParam(value = "报表排版关系") @ApiParam(value = "报表排版关系")
private List<BrRefReportTypeset> brRefReportTypesetList; private List<BrRefReport> brRefReportList;
} }

2
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java
Unescape Escape View File

@ -48,7 +48,7 @@
// //
// @Transient // @Transient
// @ApiParam(value ="报表模板列表") // @ApiParam(value ="报表模板列表")
// private List<BrRefReportTypeset> brRefReportTypesetList; // private List<BrRefReport> brRefReportList;
// //
// @Transient // @Transient
// @ApiParam(value ="元素所在的列") // @ApiParam(value ="元素所在的列")

28
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java
Unescape Escape View File

@ -1,14 +1,14 @@
package cn.estsh.i3plus.pojo.report.repository; //package cn.estsh.i3plus.pojo.report.repository;
//
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; //import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn; //import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn;
//
/** ///**
* @Description : // * @Description :
* @Reference : // * @Reference :
* @Author : alwaysfrin // * @Author : alwaysfrin
* @CreateDate : 2018-12-26 20:23 // * @CreateDate : 2018-12-26 20:23
* @Modify: // * @Modify:
**/ // **/
public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,Long> { //public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,Long> {
} //}

4
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java → modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.report.repository; package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset; import cn.estsh.i3plus.pojo.report.bean.BrLayoutElement;
/** /**
* @Description : * @Description :
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset;
* @CreateDate : 2018-12-26 20:23 * @CreateDate : 2018-12-26 20:23
* @Modify: * @Modify:
**/ **/
public interface BrRefReportTypesetRepository extends BaseRepository<BrRefReportTypeset,Long> { public interface BrLayoutElementRepository extends BaseRepository<BrLayoutElement,Long> {
} }

28
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java
Unescape Escape View File

@ -1,14 +1,14 @@
package cn.estsh.i3plus.pojo.report.repository; //package cn.estsh.i3plus.pojo.report.repository;
//
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; //import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow; //import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow;
//
/** ///**
* @Description : // * @Description :
* @Reference : // * @Reference :
* @Author : alwaysfrin // * @Author : alwaysfrin
* @CreateDate : 2018-12-26 20:23 // * @CreateDate : 2018-12-26 20:23
* @Modify: // * @Modify:
**/ // **/
public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,Long> { //public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,Long> {
} //}

14
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrRefReport;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-12-26 20:23
* @Modify:
**/
public interface BrRefReportRepository extends BaseRepository<BrRefReport,Long> {
}

46
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
Unescape Escape View File

@ -99,14 +99,14 @@ public class ReportHqlPack {
* @param brElement * @param brElement
* @return * @return
*/ */
public static String packHqlBrElement(BrElement brElement){ public static DdlPackBean packHqlBrElement(BrElement brElement){
StringBuffer result = new StringBuffer(); DdlPackBean result = DdlPackBean.getDdlPackBean(brElement);
// 查询参数封装 // 查询参数封装
HqlPack.getNumEqualPack(brElement.getElementType(),"elementType",result); DdlPreparedPack.getNumEqualPack(brElement.getElementType(),"elementType",result);
HqlPack.getStringLikerPack(brElement.getElementName(),"elementName",result); DdlPreparedPack.getStringLikerPack(brElement.getElementName(),"elementName",result);
return result.toString(); return result;
} }
/** /**
@ -158,14 +158,32 @@ public class ReportHqlPack {
* @param brReport * @param brReport
* @return * @return
*/ */
public static String packHqlBrReport(BrReport brReport){ public static DdlPackBean packHqlBrReport(BrReport brReport){
StringBuffer result = new StringBuffer(); DdlPackBean result = DdlPackBean.getDdlPackBean(brReport);
// 查询参数封装 // 查询参数封装
HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result); DdlPreparedPack.getStringLikerPack(brReport.getReportName(),"reportName",result);
HqlPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result); DdlPreparedPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result);
return result.toString(); return result;
}
/**
* 报表查询
* @param refReport
* @return
*/
public static DdlPackBean packHqlBrRefReport(BrRefReport refReport){
DdlPackBean result = DdlPackBean.getDdlPackBean(refReport);
// 查询参数封装
DdlPreparedPack.getNumEqualPack(refReport.getReportId(),"reportId",result);
DdlPreparedPack.getNumEqualPack(refReport.getLayoutId(),"layoutId",result);
DdlPreparedPack.getNumEqualPack(refReport.getLayoutElementId(),"layoutElementId",result);
DdlPreparedPack.getNumEqualPack(refReport.getRefTypeId(),"refTypeId",result);
DdlPreparedPack.getNumEqualPack(refReport.getRefId(),"refId",result);
return result;
} }
/** /**
@ -225,4 +243,12 @@ public class ReportHqlPack {
return result; return result;
} }
public static DdlPackBean packHqlBrLayoutElement(BrLayoutElement bean){
DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getNumEqualPack(bean.getLayoutId(),"layoutId",result);
return result;
}
} }

Write Preview
Loading…
Cancel
Save