From bc488f20b6da6f09c6050a470893c9201269cd5c Mon Sep 17 00:00:00 2001 From: jmu Date: Sun, 6 May 2018 17:16:37 +0800 Subject: [PATCH 1/3] add datetime feature (cherry picked from commit dc40a5d) --- .../java/com/ibeetl/admin/core/util/Tool.java | 23 +++++++++++++++---- .../src/main/resources/static/js/lib.js | 14 +++++++++-- .../templates/common/tag/searchForm.tag.html | 13 +++++++++++ 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java index 07156598..576ed23d 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java @@ -1,8 +1,8 @@ package com.ibeetl.admin.core.util; +import org.apache.commons.lang3.time.DateUtils; + import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; /** @@ -13,20 +13,33 @@ import java.util.Date; */ public class Tool { static final String DATE_FORAMT = "yyyy-MM-dd"; - static final String DATETIME_FORAMT = "yyyy-MM-dd hh:mm:ss"; + static final String DATETIME_FORAMT = "yyyy-MM-dd HH:mm:ss"; public static Date[] parseDataRange(String str) { //查询范围 - String[] arrays = str.split("至"); + String[] arrays = str.split(""); Date min = parseDate(arrays[0]); Date max = parseDate(arrays[1]); return new Date[] { min,max }; } + public static Date[] parseDataTimeRange(String str) { + //查询范围 + String[] arrays = str.split("To"); + Date min = parseDateWithPattern(arrays[0], DATETIME_FORAMT); + Date max = parseDateWithPattern(arrays[1], DATETIME_FORAMT); + + return new Date[] { min,max }; + } + public static Date parseDate(String str) { + return parseDateWithPattern(str, DATE_FORAMT); + } + + public static Date parseDateWithPattern(String str, String pattern) { try { - return new SimpleDateFormat(DATE_FORAMT).parse(str.trim()); + return DateUtils.parseDate(str.trim(), pattern); } catch (ParseException e) { throw new RuntimeException(e); } diff --git a/admin-core/src/main/resources/static/js/lib.js b/admin-core/src/main/resources/static/js/lib.js index 540ac7ab..a49c16f0 100644 --- a/admin-core/src/main/resources/static/js/lib.js +++ b/admin-core/src/main/resources/static/js/lib.js @@ -182,9 +182,19 @@ var Lib = { laydate = layui.laydate; laydate.render({ elem : $(this)[0], - range : '至' + range : 'To' }); - }) + }); + + $(form).find(".datetime-range-pick").find("input").each(function() { + laydate = layui.laydate; + laydate.render({ + elem : $(this)[0], + range : 'To', + type: 'datetime' + }); + }); + $(form).find(".input-date").each(function() { laydate = layui.laydate; diff --git a/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html b/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html index 1b86b186..7d532d77 100644 --- a/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html +++ b/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html @@ -47,6 +47,19 @@ case 2:{ //日期范围 + +
+ +
+
+ +
+
+
+ -- Gitee From 46227d5b21c6251a5a90214e93534b45b15e8f71 Mon Sep 17 00:00:00 2001 From: jmu Date: Sun, 6 May 2018 17:31:45 +0800 Subject: [PATCH 2/3] add datetime feature (cherry picked from commit dc40a5d) --- admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java | 2 +- admin-core/src/main/resources/static/js/lib.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java index 576ed23d..bca893c6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java @@ -26,7 +26,7 @@ public class Tool { public static Date[] parseDataTimeRange(String str) { //查询范围 - String[] arrays = str.split("To"); + String[] arrays = str.split("至"); Date min = parseDateWithPattern(arrays[0], DATETIME_FORAMT); Date max = parseDateWithPattern(arrays[1], DATETIME_FORAMT); diff --git a/admin-core/src/main/resources/static/js/lib.js b/admin-core/src/main/resources/static/js/lib.js index a49c16f0..4bb486fe 100644 --- a/admin-core/src/main/resources/static/js/lib.js +++ b/admin-core/src/main/resources/static/js/lib.js @@ -182,7 +182,7 @@ var Lib = { laydate = layui.laydate; laydate.render({ elem : $(this)[0], - range : 'To' + range : '至' }); }); @@ -190,7 +190,7 @@ var Lib = { laydate = layui.laydate; laydate.render({ elem : $(this)[0], - range : 'To', + range : '至', type: 'datetime' }); }); -- Gitee From a3fccba58496c998ea3692805dcf2106dda42c9c Mon Sep 17 00:00:00 2001 From: jmu Date: Sun, 6 May 2018 17:34:54 +0800 Subject: [PATCH 3/3] add datetime feature (cherry picked from commit dc40a5d) --- admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java index bca893c6..3201db8e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/Tool.java @@ -17,7 +17,7 @@ public class Tool { public static Date[] parseDataRange(String str) { //查询范围 - String[] arrays = str.split(""); + String[] arrays = str.split("至"); Date min = parseDate(arrays[0]); Date max = parseDate(arrays[1]); -- Gitee