From 9beafd1bc6ba985f5115e45f59e835ac1d93ec54 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Mon, 1 Apr 2019 18:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=20=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=BE=AE=E6=9C=8D=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=A7=92=E8=89=B2=E8=8E=B7=E5=8F=96=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/form/bean/BfRefMethodRole.java     | 21 ++++++++--------
 .../i3plus/pojo/form/sqlpack/FormHqlPack.java      | 29 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
index d41e560..929fe5c 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.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,26 +25,26 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BF_REF_METHOD_ROLE")
-@Api(value="功能角色关系",description = "功能角色关系")
+@Table(name = "BF_REF_METHOD_ROLE")
+@Api(value = "功能角色关系", description = "功能角色关系")
 public class BfRefMethodRole extends BaseBean {
 
-    @Column(name="METHOD_ID")
-    @ApiParam(value ="表单功能id")
+    @Column(name = "METHOD_ID")
+    @ApiParam(value = "表单功能id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
-    @Column(name="METHOD_NAME_RDD")
-    @ApiParam(value ="表单功能名称")
+    @Column(name = "METHOD_NAME_RDD")
+    @ApiParam(value = "表单功能名称")
     private String methodNameRdd;
 
-    @Column(name="ROLE_ID")
-    @ApiParam(value ="角色id")
+    @Column(name = "ROLE_ID")
+    @ApiParam(value = "角色id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
-    @Column(name="ROLE_NAME_RDD")
-    @ApiParam(value ="角色名称")
+    @Column(name = "ROLE_NAME_RDD")
+    @ApiParam(value = "角色名称")
     private String roleNameRdd;
 
 }
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
index 6fdcbef..428758e 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
@@ -45,6 +45,35 @@ public final class FormHqlPack {
     }
 
     /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @param isDeleted 数据状态
+     * @return hql
+     */
+    public static String packHqlIdsAndIsDeleted(String columnName, String[] params, Integer isDeleted) {
+        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+
+        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result.toString();
+    }
+
+
+    /**
+     * In 参数封装
+     * @param columnName 列名
+     * @param params 参数
+     * @param isDeleted 数据状态
+     * @return hql
+     */
+    public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
+        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+
+        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result.toString();
+    }
+
+    /**
      * 表单布局复杂查询
      * @param bfLayout 表单布局
      * @return hql