自定义按钮功能接口

消息优化

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1053,9 +1053,10 @@ public class ImppEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_RECEIVER_TYPE {
-        INTERNAL(1, "内部人员接收"),
+        INTERNAL(1, "内部人员"),
-        EXTERNAL(2, "外部人员接收"),
+        EXTERNAL(2, "外部人员"),
-        URGENT(3, "紧急联系人接收");
+        URGENT(3, "紧急联系人"),
+        SUPPLIER(4, "供应商");
         private int value;
         private String description;
 

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

@@ -38,9 +38,9 @@ public class BfButton extends BaseBean {
     @ApiParam(value = "触发方式")
     private Integer triggerMode;
 
-    public Integer getTriggerMode() {
+    public int getTriggerModeVal() {
         if (triggerMode == null) {
-            return null;
+            return 0;
         } else {
             return triggerMode.intValue();
         }

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

@@ -13,6 +13,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 :
@@ -46,4 +48,8 @@ public class BfMethod extends BaseBean {
     @Column(name="METHOD_DESCRIPTION")
     @ApiParam(value ="功能描述")
     private String methodDescription;
+
+    @Transient
+    @ApiParam(value ="表单功能自定义按钮")
+    private List<BfButton> bfButtonList;
 }

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

@@ -13,6 +13,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 :
@@ -57,5 +59,7 @@ public class BfMethodDetail extends BaseBean {
     @ApiParam(value ="表单元素名称")
     private String elementNameRdd;
 
-
+    @Transient
+    @ApiParam(value ="表单功能自定义按钮")
+    private List<BfButton> bfButtonList;
 }

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

@@ -44,6 +44,14 @@ public class BfRefButtonMethod extends BaseBean {
     @ApiParam(value ="按钮位置类型")
     private Integer buttonPositionType;
 
+    public int getButtonPositionTypeVal(){
+        if(buttonId == null){
+            return 0;
+        } else {
+            return buttonPositionType.intValue();
+        }
+    }
+
     @Column(name="BUTTON_POSITION_REF_ID")
     @ApiParam(value ="按钮位置关联id")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -297,4 +297,21 @@ public final class FormHqlPack {
 
         return ddlPackBean;
     }
+
+    /**
+     * 元素信息复杂查询
+     * @param bfElement 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfElement(BfElement bfElement){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElement.getDataObjectId(), "dataObjectId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElement.getElementType(), "elementType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElement.getIsDeleted(), "isDeleted", ddlPackBean);
+
+        return ddlPackBean;
+    }
 }