自定义报表 目录功能 联调完成

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 报表类选择模型
@@ -19,6 +20,12 @@ import java.io.Serializable;
 @ToString
 public class ClassModel implements Serializable {
 
+    @ApiParam(value ="服务ID")
+    private int serverId;
+
+    @ApiParam(value ="服务ID")
+    private String serverName;
+
     @ApiParam(value ="包名")
     private String packageName;
 
@@ -30,4 +37,7 @@ public class ClassModel implements Serializable {
 
     @ApiParam(value ="类描述")
     private String clzDesc;
+
+    @ApiParam(value ="属性集合")
+    private List<ClassFieldModel> fieldList;
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java

@@ -96,8 +96,12 @@ public class BrMenu extends BaseBean {
     private String roleNamesRdd;
 
     @Transient
+    @ApiParam(value ="查询 ID 集合")
+    private List<Long> findIdList = new ArrayList<>();
+
+    @Transient
     @ApiParam(value ="角色ID 集合")
-    private List<Long> roleIdList = new ArrayList<>();
+    private List<String> roleIdList = new ArrayList<>();
 
     @Transient
     @ApiParam(value ="子集列表")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java

@@ -27,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="BR_POJO_ATTR")
-@Api(value="报表模板",description = "报表模板")
+@Api(value="对象属性",description = "对象属性")
 public class BrPojoAttr extends BaseBean {
 
     @Column(name="TEMPLATE_ID")
@@ -39,10 +39,6 @@ public class BrPojoAttr extends BaseBean {
     @ApiParam(value ="服务编号",example = "-1")
     private Integer serverId;
 
-    @Column(name="POJO_CLASS_PATH")
-    @ApiParam(value ="对象ClassPath")
-    private String pojoClassPath;
-
     @Column(name="POJO_NAME")
     @ApiParam(value ="对象名称")
     private String pojoName;
@@ -51,6 +47,14 @@ public class BrPojoAttr extends BaseBean {
     @ApiParam(value ="对象别名")
     private String pojoNameAlias;
 
+    @Column(name="ATTR_NAME")
+    @ApiParam(value ="对象别名")
+    private String attrName;
+
+    @Column(name="ATTR_NAME_ALIAS")
+    @ApiParam(value ="对象别名")
+    private String attrNameAlias;
+
     @Column(name="ATTR_TYPE")
     @ApiParam(value ="属性类型",example = "-1")
     private Integer attrType;

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java

@@ -27,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="BR_REF_POJO")
-@Api(value="报表模板",description = "报表模板")
+@Api(value="对象关系",description = "对象关系")
 public class BrRefPojo extends BaseBean {
 
     @Column(name="MASTER_TEMPLATE_ID")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java

@@ -27,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="BR_REF_SERVER_POJO")
-@Api(value="报表模板",description = "报表模板")
+@Api(value="报表模板服务对象",description = "报表模板服务对象")
 public class BrRefServerPojo extends BaseBean {
 
     @Column(name="TEMPLATE_ID")
@@ -44,19 +44,27 @@ public class BrRefServerPojo extends BaseBean {
     private Integer serverId;
 
     @Column(name="SERVER_NAME_RDD")
-    @ApiParam(value ="服务名称" , access ="模板名称")
+    @ApiParam(value ="服务名称" , access ="服务名称")
     private String serverNameRdd;
 
+    @Column(name="SERVER_PACKAGE_NAME_RDD")
+    @ApiParam(value ="服务对象包名称" , access ="服务对象包名称")
+    private String serverPackageNameRdd;
+
     @Column(name="SERVER_POJO_NAME_RDD")
-    @ApiParam(value ="服务对象名称" , access ="模板名称")
+    @ApiParam(value ="服务对象名称" , access ="服务对象名称")
     private String serverPojoNameRdd;
 
+    @Column(name="SERVER_POJO_NAME_DESC_RDD")
+    @ApiParam(value ="服务对象名称中文" , access ="服务对象名称中文")
+    private String serverPojoNameDescRdd;
+
     @Column(name="SERVER_POJO_NAME_ALIAS")
-    @ApiParam(value ="服务对象别名" , access ="模板名称")
+    @ApiParam(value ="服务对象别名" , access ="服务对象别名")
     private String serverPojoNameAlias;
 
     @Column(name="SERVER_POJO_CLASS_PATH")
-    @ApiParam(value ="服务对象名称" , access ="模板名称")
-    private String serverPojoClassPath;
+    @ApiParam(value ="对象全路径名称" , access ="对象全路径名称")
+    private String serverPojoFullName;
 
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java

@@ -27,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="BR_REF_TEMPLATE_SERVER")
-@Api(value="报表模板",description = "报表模板")
+@Api(value="报表模板-服务",description = "报表模板-服务")
 public class BrRefTemplateServer extends BaseBean {
 
     @Column(name="TEMPLATE_ID")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java

@@ -11,6 +11,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 :
@@ -92,4 +94,32 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="模板HTML" , access ="模板HTML")
     private String templateHtml;
 
+    @Transient
+    @ApiParam(value ="模板服务")
+    private List<BrRefTemplateServer> serverList;
+
+    @Transient
+    @ApiParam(value ="模板服务对象")
+    private List<BrRefServerPojo> serverPojoList;
+
+    @Transient
+    @ApiParam(value ="模板服务对象关系")
+    private List<BrRefPojo> serverPojoRefList;
+
+    @Transient
+    @ApiParam(value ="模板服务对象查询条件")
+    private List<BrPojoAttr> pojoAttrWhereList;
+
+    @Transient
+    @ApiParam(value ="模板服务对象分组条件")
+    private List<BrPojoAttr> pojoAttrGroupList;
+
+    @Transient
+    @ApiParam(value ="模板服务对象聚合条件")
+    private List<BrPojoAttr> pojoAttrAggrList;
+
+    @Transient
+    @ApiParam(value ="模板服务对象显示属性")
+    private List<BrPojoAttr> pojoAttrShowList;
+
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java

@@ -35,9 +35,9 @@ public class BrTemplateCustomHql extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long templateId;
 
-    @Column(name="CUSTOM_TYPE")
+    @Column(name="DATA_TYPE")
     @ApiParam(value ="自定义类型" , example ="-1")
-    private Integer customType;
+    private Integer dataType;
 
     @Column(name="CUSTOM_CONTENT",columnDefinition="TEXT")
     @ApiParam(value ="自定义语句内容" , access ="自定义语句内容")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -58,6 +58,10 @@ public class ReportHqlPack {
         HqlPack.getStringLikerPack(menu.getName(),"name",result);
         HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
 
+        if(menu.getFindIdList() != null && menu.getFindIdList().size() > 0){
+            HqlPack.getInPack(StringUtils.join(menu.getFindIdList(),","),"id",result);
+        }
+
         // 添加默认排序
         HqlPack.getOrderDefault(menu);
 

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/TemplateHqlPack.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.report.sqlpack;
+
+/**
+ * @Description : 报表对象封装
+ * @Reference :
+ * @Author : wei peng
+ * @CreateDate : 2019-01-17 15:41
+ * @Modify:
+ **/
+public class TemplateHqlPack {
+
+
+}