Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

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

消息管理 全部完成
文件管理 全部完成
任务表达式 全部完成
HqlPack  日期非空校验 调整

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

@@ -38,6 +38,15 @@ public class SysFile extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
+    public Long getUserId() {
+        if(userId != null) {
+            return userId.longValue();
+        }else{
+            return userId;
+        }
+    }
+
+
     @Column(name="FILE_PATH")
     @ApiParam(value ="文件路径")
     private String filePath;
@@ -47,8 +56,8 @@ public class SysFile extends BaseBean {
     private String fileOriginalName;
  
     @Column(name="FILE_TYPE_ID")
-    @ApiParam(value ="文件类型ID(字典)")
+    @ApiParam(value ="文件类型ID")
-    private String fileTypeId;
+    private Long fileTypeId;
  
     @Column(name="FILE_TYPE_NAME")
     @ApiParam(value ="文件类型名称")

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

@@ -230,4 +230,35 @@ public class CoreHqlPack {
 
         return  result.toString();
     }
+
+    /**
+     * 文件资源复杂查询
+     * @param sysFile
+     * @return
+     */
+    public static String packHqlSysFile(SysFile sysFile) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(sysFile.getName(),"name",result);
+        HqlPack.getNumEqualPack(sysFile.getFileTypeId(),"fileTypeId",result);
+        HqlPack.getStringLikerPack(sysFile.getCreateUser(),"createUser",result);
+        HqlPack.timeBuilder(sysFile.getCreateDatetime(),"createDatetime",result,false,false);
+
+        return  result.toString();
+    }
+
+    /**
+     * 任务表达式复杂查询
+     * @param taskTimeExpression
+     * @return
+     */
+    public static String packHqlSysFile(TaskTimeExpression taskTimeExpression) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result);
+
+        return  result.toString();
+    }
 }