From d5bbf84965cdaf3977dcfb89995d840d669fa584 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Fri, 30 Nov 2018 14:26:46 +0800
Subject: [PATCH] =?UTF-8?q?hql=E6=97=A5=E6=9C=9F=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/tool/HqlPack.java    | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java
index a108879..fa95759 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java
@@ -106,6 +106,32 @@ public class HqlPack {
 		}
 	}
 
+
+	/**
+	 * 封装日期
+	 * @param date 日期，需要和时间字段的值格式相同
+	 * @param startColumnName HQL里对应的开始时间字段
+	 * @param endColumnName HQL里对应的结束时间字段
+	 * @param result 封装的HQL
+	 * @param isShowTime 是否包含时分秒
+	 */
+	public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, StringBuffer result,boolean isShowTime) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		if(date != null && date.trim().length() > 0) {
+			date = getSafeParam(date);
+		}else {
+			date = sdf.format(new Date());
+		}
+		if(!isShowTime) {
+			date = date.substring(0,10);
+			result.append(" and '"+date+"' between substring(model." + startColumnName + ",1,10) and substring(model." + endColumnName + ",1,10)");
+			return;
+		}else if(date.trim().length()<=11){
+			date+= " 00:00:00";
+		}
+		result.append(" and '"+date+"' between model." + startColumnName + " and model." + endColumnName);
+	}
+
 	/**
 	 * 封装String对象成order by排序
 	 * @param columnName 列名