解决冲突

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

@@ -79,9 +79,8 @@ public class ImppEnumUtil {
         }
     }
 
-
     /**
-     * 组织类型
+     * 定时任务方法类型
      * 1.Java Class 方法
      * 2.Http URL
      * 3.权限CODE
@@ -222,7 +221,6 @@ public class ImppEnumUtil {
         }
     }
 
-
     /**
      * 操作日志类型
      * 1.INSERT：添加，
@@ -634,7 +632,6 @@ public class ImppEnumUtil {
         }
     }
 
-
     /**
      * 系统参数类型
      * 1.SYSTEM：系统参数

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java

@@ -60,7 +60,7 @@ public class HqlPack {
 	 * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有
 	 * @param isShowTime 是否包含时分秒
 	 */
-	public static void timeBuilder( String date, String columnName, StringBuffer result, Boolean showTaday,boolean isShowTime) {
+		public static void timeBuilder( String date, String columnName, StringBuffer result, Boolean showTaday,boolean isShowTime) {
 		if(date != null && date.trim().length() > 0){
 			date = getSafeParam(date);
 

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

@@ -37,7 +37,16 @@ public class SysFile extends BaseBean {
     @ApiParam(value ="用户ID" , example = "-1")
     @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(字典)")
-    private String fileTypeId;
+    @ApiParam(value ="文件类型ID")
+    private Long fileTypeId;
  
     @Column(name="FILE_TYPE_NAME")
     @ApiParam(value ="文件类型名称")

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

@@ -47,7 +47,6 @@ public class TaskTime extends BaseBean {
         }
     }
 
-
     @Column(name="RED_TIME_NAME")
     @ApiParam(value ="时间表达式名称")
     private String redTimeName;
@@ -90,7 +89,7 @@ public class TaskTime extends BaseBean {
  
     @Column(name="TASK_STATUS")
     @ApiParam(value ="任务状态（1.正常，2.禁用）" , example ="1")
-    private Integer taskStatus = 1;
+    private Integer taskStatus;
  
     @Column(name="LAST_RUN_DATE_TIME")
     @ApiParam(value ="最后运行时间" , access ="最后运行时间")

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

@@ -232,6 +232,53 @@ public class CoreHqlPack {
     }
 
     /**
+     * 文件资源复杂查询
+     * @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 packHqlTaskTimeExpression(TaskTimeExpression taskTimeExpression) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result);
+
+        return  result.toString();
+    }
+
+    /**
+     * 定时任务复杂查询
+     * @param taskTime
+     * @return
+     */
+    public static String packHqlTaskTime(TaskTime taskTime){
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(taskTime.getName(),"name",result);
+        HqlPack.getNumEqualPack(taskTime.getTaskStatus(),"taskStatus",result);
+        HqlPack.getNumEqualPack(taskTime.getTimeId(),"timeId",result);
+
+        return  result.toString();
+    }
+
+    /**
      * 用戶复杂查询
      * @param user
      * @return