细节优化

bug修复

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.form.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.form.bean.*;
 import org.apache.commons.lang3.StringUtils;
@@ -154,15 +156,15 @@ public final class FormHqlPack {
      * @param bfIntercept 查询条件
      * @return hql
      */
-    public static String packHqlBfIntercept(BfIntercept bfIntercept) {
+    public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) {
-        StringBuffer result = new StringBuffer();
+        DdlPackBean ddlPackBean = new DdlPackBean();
 
-        HqlPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", result);
+        DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
-        HqlPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", result);
+        DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
-        HqlPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", result);
+        DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
-        result.append(bfIntercept.orderBy());
+        ddlPackBean.setOrderByStr(bfIntercept.orderBy());
 
-        return result.toString();
+        return ddlPackBean;
     }
 
     /**

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -11,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -57,6 +54,10 @@ public class SysTaskPlan extends BaseBean {
     @ApiParam(value = "定时任务运行次数", example = "0")
     private Integer taskPlanExecNum;
 
+    /**
+     * 获取定时任务运行次数
+     * @return 定时任务运行次数
+     */
     public int getTaskPlanExecNumValue() {
         if (taskPlanExecNum == null) {
             return 0;