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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java

@@ -96,7 +96,7 @@ public class PagerHelper {
         }
 
         int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize();
-        pager.setStartRow(startRow == 0 ? 1 : startRow);
+        pager.setStartRow(startRow);
 
         int endRow;
         if (startRow + pager.getPageSize() <= rowCount) {

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -50,10 +51,11 @@ public class SysMessage extends BaseBean {
         if (this.messageType == null) {
             return 0;
         } else {
-            return this.messageType.intValue();
+            return this.messageType;
         }
     }
 
+    @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE_CONTENT.class)
     @Column(name = "MESSAGE_TYPE_CONTENT")
     @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1")
     private Integer messageContentType;
@@ -154,4 +156,16 @@ public class SysMessage extends BaseBean {
     @ApiParam(value = "附件集合")
     private List<SysFileAttach> sysFileAttachList;
 
+    @Transient
+    @ApiParam(value = "附件id集合")
+    private List<Long> fileAttachIdList;
+
+    public void addFileAttachId(Long attachId){
+        if(fileAttachIdList == null){
+            fileAttachIdList = new ArrayList<>();
+        }
+
+        fileAttachIdList.add(attachId);
+    }
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -476,6 +476,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean);
 
         DdlPreparedPack.getOrderDefault(message);
+        ddlPackBean.setOrderByStr(message.orderBy());
 
         return ddlPackBean;
     }
@@ -487,6 +488,7 @@ public class CoreHqlPack {
      * @return
      */
     public static DdlPackBean packHqlSysFile(SysFile file) {
+        DdlPreparedPack.getOrderDefault(file);
         DdlPackBean result = DdlPackBean.getDdlPackBean(file);
 
         // hql拼接

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -120,6 +121,19 @@ public class BsSuitCaseFTP extends BaseBean {
         return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal());
     }
 
+    @ColumnDefault("2")
+    @Column(name = "IS_CHECK_FILE")
+    @ApiParam(value = "是否校验文件")
+    private Integer isCheckFile;
+
+    public boolean isCheckFile(){
+        return isCheckFile != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isCheckFile);
+    }
+
+    @Column(name = "CHECK_FILE_PATH")
+    @ApiParam(value = "校验文件路径")
+    private String checkFilePath;
+
     @Transient
     @ApiParam(value = "临时适配路径")
     private String tempSuitFilePath;