From 0bc9f2e9bcb5602d99ee0eee2ba95e8ea11572c4 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Fri, 23 Aug 2019 10:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF=20?=
 =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index df4aba7..7e544a4 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -859,6 +861,22 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate);
+
+        // hql拼接
+        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean);
+
+        DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true);
+
+        // 添加默认排序
+        HqlPack.getOrderDefault(sysLabelTemplate);
+
+        return ddlPackBean;
+    }
+
     /**
      * 打印模板参数复杂查询
      * @param sysLabelTemplateParam