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

定时任务 全部完成

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-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

@@ -253,7 +253,7 @@ public class CoreHqlPack {
      * @param taskTimeExpression
      * @return
      */
-    public static String packHqlSysFile(TaskTimeExpression taskTimeExpression) {
+    public static String packHqlTaskTimeExpression(TaskTimeExpression taskTimeExpression) {
         StringBuffer result = new StringBuffer();
 
         // hql拼接
@@ -261,4 +261,20 @@ public class CoreHqlPack {
 
         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();
+    }
 }