表单报表部分功能

定时任务优化

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java

@@ -7,7 +7,6 @@ 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;
@@ -26,39 +25,39 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BF_LAYOUT")
+@Table(name = "BF_LAYOUT")
-@Api(value="自定义表单布局")
+@Api(value = "自定义表单布局")
 public class BfLayout extends BaseBean {
 
-    @Column(name="LAYOUT_NAME")
+    @Column(name = "LAYOUT_NAME")
-    @ApiParam(value ="名称")
+    @ApiParam(value = "名称")
     private String layoutName;
 
-    @Column(name="LAYOUT_WIDTH")
+    @Column(name = "LAYOUT_WIDTH")
-    @ApiParam(value ="布局宽度")
+    @ApiParam(value = "布局宽度")
     private Double layoutWidth;
 
-    @Column(name="LAYOUT_HEIGHT")
+    @Column(name = "LAYOUT_HEIGHT")
-    @ApiParam(value ="布局高度")
+    @ApiParam(value = "布局高度")
     private Double layoutHeight;
 
-    @Column(name="LAYOUT_ROW_COUNT")
+    @Column(name = "LAYOUT_ROW_COUNT")
-    @ApiParam(value ="行数")
+    @ApiParam(value = "行数")
     private Integer layoutRowCount;
 
-    @Column(name="LAYOUT_COLUMN_COUNT")
+    @Column(name = "LAYOUT_COLUMN_COUNT")
-    @ApiParam(value ="列数")
+    @ApiParam(value = "列数")
     private Integer layoutColumnCount;
 
-    @Column(name="LAYOUT_REPORT_COUNT")
+    @Column(name = "LAYOUT_REPORT_COUNT")
-    @ApiParam(value ="引用报表数量")
+    @ApiParam(value = "引用报表数量")
     private Integer layoutReportCount;
 
-    @Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT")
+    @Column(name = "LAYOUT_DESCRIPTION", columnDefinition = "TEXT")
-    @ApiParam(value ="布局描述")
+    @ApiParam(value = "布局描述")
     private String layoutDescription;
 
+    // 布局行集合
     @Transient
-    @ApiParam(value ="模板行集合")
+    private List<BfLayoutRow> bfLayoutRows;
-    private List<BfLayoutRow> brLayoutRows;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java

@@ -9,7 +9,6 @@ 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;
@@ -26,41 +25,41 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BF_LAYOUT_COLUMN")
+@Table(name = "BF_LAYOUT_COLUMN")
-@Api(value="自定义表单布局-列")
+@Api(value = "自定义表单布局-列")
 public class BfLayoutColumn extends BaseBean {
 
-    @Column(name="LAYOUT_ID")
+    @Column(name = "LAYOUT_ID")
-    @ApiParam(value ="布局主键")
+    @ApiParam(value = "布局主键")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutId;
 
-    @Column(name="LAYOUT_ROW_ID")
+    @Column(name = "LAYOUT_ROW_ID")
-    @ApiParam(value ="行主键")
+    @ApiParam(value = "行主键")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutRowId;
 
-    @Column(name="COLUMN_COLSPAN")
+    @Column(name = "COLUMN_COLSPAN")
-    @ApiParam(value ="跨列数")
+    @ApiParam(value = "跨列数")
     private Integer columnColspan;
 
-    @Column(name="COLUMN_ROWSPAN")
+    @Column(name = "COLUMN_ROWSPAN")
-    @ApiParam(value ="跨行数")
+    @ApiParam(value = "跨行数")
     private Integer columnRowspan;
 
-    @Column(name="COLUMN_WIDTH")
+    @Column(name = "COLUMN_WIDTH")
-    @ApiParam(value ="列宽")
+    @ApiParam(value = "列宽")
     private Integer columnWidth;
 
-    @Column(name="COLUMN_STYLE")
+    @Column(name = "COLUMN_STYLE")
-    @ApiParam(value ="列样式")
+    @ApiParam(value = "列样式")
     private String columnStyle;
 
-    @Column(name="COLUMN_SORT")
+    @Column(name = "COLUMN_SORT")
-    @ApiParam(value ="排序，降序")
+    @ApiParam(value = "排序，降序")
     private Integer columnSort;
 
-    @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT")
+    @Column(name = "COLUMN_DESCRIPTION", columnDefinition = "TEXT")
-    @ApiParam(value ="列描述")
+    @ApiParam(value = "列描述")
     private String columnDescription;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java

@@ -9,7 +9,6 @@ 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;
@@ -28,32 +27,32 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BF_LAYOUT_ROW")
+@Table(name = "BF_LAYOUT_ROW")
-@Api(value="自定义表单布局-行")
+@Api(value = "自定义表单布局-行")
 public class BfLayoutRow extends BaseBean {
 
-    @Column(name="LAYOUT_ID")
+    @Column(name = "LAYOUT_ID")
-    @ApiParam(value ="布局主键")
+    @ApiParam(value = "布局主键")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutId;
 
-    @Column(name="ROW_HEIGHT")
+    @Column(name = "ROW_HEIGHT")
-    @ApiParam(value ="行高")
+    @ApiParam(value = "行高")
     private Integer rowHeight;
 
-    @Column(name="ROW_SORT")
+    @Column(name = "ROW_SORT")
-    @ApiParam(value ="排序")
+    @ApiParam(value = "排序")
     private Integer rowSort;
 
-    @Column(name="ROW_STYLE",columnDefinition = "TEXT")
+    @Column(name = "ROW_STYLE", columnDefinition = "TEXT")
-    @ApiParam(value ="行样式")
+    @ApiParam(value = "行样式")
     private String rowStyle;
 
-    @Column(name="ROW_COL_NUM")
+    @Column(name = "ROW_COL_NUM")
-    @ApiParam(value ="行所关联列数")
+    @ApiParam(value = "行所关联列数")
     private Integer rowColNum;
 
+    // 行所包含的列
     @Transient
-    @ApiParam(value ="行所包含的列")
+    private List<BfLayoutColumn> bfLayoutColumns;
-    private List<BfLayoutColumn> brLayoutColumns;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -1,5 +1,10 @@
 package cn.estsh.i3plus.pojo.form.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.form.bean.BfLayout;
+import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * @Description :
  * @Reference :
@@ -7,5 +12,81 @@ package cn.estsh.i3plus.pojo.form.sqlpack;
  * @CreateDate : 2019-03-21 15:16
  * @Modify:
  **/
-public class FormHqlPack {
+public final class FormHqlPack {
+
+    private FormHqlPack() {
+    }
+
+    /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @return hql
+     */
+    public static String packHqlIds(String columnName, String[] params) {
+        StringBuffer result =  new StringBuffer();
+
+        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getInPack(String.join(",", params), columnName, result);
+        return result.toString();
+    }
+
+    /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @return hql
+     */
+    public static String packHqlIds(String columnName, Long[] params) {
+        StringBuffer result =  new StringBuffer();
+
+        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getInPack(StringUtils.join(params, ","), columnName, result);
+        return result.toString();
+    }
+
+    /**
+     * 表单布局复杂查询
+     * @param bfLayout 表单布局
+     * @return hql
+     */
+    public static String packHqlBfLayout(BfLayout bfLayout) {
+        StringBuffer result =  new StringBuffer();
+
+        HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
+        HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
+
+        return result.toString();
+    }
+
+    /**
+     * 根据表单布局查询表单布局行
+     * @param bfLayout 表单布局
+     * @return hql
+     */
+    public static String packHqlBfLayoutRowByBfLayout(BfLayout bfLayout) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getNumEqualPack(bfLayout.getId(), "layoutId", result);
+        HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
+
+        result.append(bfLayout.orderBy());
+        return result.toString();
+    }
+
+    /**
+     * 根据表单布局行查询表单布局列
+     * @param bfLayoutRow 表单布局行
+     * @return hql
+     */
+    public static String packHqlBfLayoutColumnByBfLayoutRow(BfLayoutRow bfLayoutRow) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
+        HqlPack.getNumEqualPack(bfLayoutRow.getId(), "layoutRowId", result);
+        HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
+
+        result.append(bfLayoutRow.orderBy());
+        return result.toString();
+    }
 }