Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -49,9 +49,9 @@ public class BfLayout extends BaseBean {
     @ApiParam(value = "列数")
     private Integer layoutColumnCount;
 
-    public Integer getLayoutColumnCount(){
+    public Integer getLayoutColumnCountValue(){
         if(this.layoutColumnCount == null) {
-            return null;
+            return 0;
         }
         return layoutColumnCount.intValue();
     }

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

@@ -52,6 +52,13 @@ public class BfLayoutRow extends BaseBean {
     @ApiParam(value = "行所关联列数")
     private Integer rowColNum;
 
+    public int getRowColNumValue(){
+        if(rowColNum == null){
+            return 0;
+        }
+        return rowColNum.intValue();
+    }
+
     // 行所包含的列
     @Transient
     private List<BfLayoutColumn> bfLayoutColumns;

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

@@ -142,15 +142,15 @@ public final class FormHqlPack {
      * @param bfMethod 表单功能查询条件
      * @return hql
      */
-    public static String packHqlBfMethod(BfMethod bfMethod) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) {
+        DdlPackBean result = new DdlPackBean();
 
-        HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
-        HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
-        HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
-        result.append(bfMethod.orderBy());
+        DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
+        DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
+        DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
+        result.setOrderByStr(bfMethod.orderBy());
 
-        return result.toString();
+        return result;
     }
 
     /**

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-04-13 15:27
+ * @Modify:
+ **/
+@Data
+public class MessagePagerModel {
+
+    private SysMessage sysMessage;
+
+    private Pager pager;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-04-13 15:27
+ * @Modify:
+ **/
+@Data
+public class RefUserMessagePagerModel {
+
+    private SysRefUserMessage sysRefUserMessage;
+
+    private Pager pager;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -48,7 +48,7 @@ public class SysMessage extends BaseBean {
 
     public int getMessageTypeValue() {
         if(this.messageType == null){
-            return ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue();
+            return 0;
         } else {
             return this.messageType.intValue();
         }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -43,6 +43,10 @@ public class SysLogTaskTime extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskPlanId;
 
+    @Column(name = "TASK_SOFT_TYPE_RDD")
+    @ApiParam(value = "任务所属模块")
+    private Integer taskSoftTypeRdd;
+
     @Column(name="TASK_CYCLE_NAME_RDD")
     @ApiParam(value ="任务周期名称")
     private String taskCycleNameRdd;