From 653aa18b7298cf09e74e144cc8dc093a79cfbfba Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 11:12:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 12 ++++++++++++
src/main/webapp/views/user/user.html | 14 +++-----------
src/main/java/com/zy/common/web/BaseController.java | 2 ++
src/main/webapp/static/js/user/user.js | 12 +-----------
4 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 8c880d1..021601e 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -22,6 +22,8 @@
*/
public class BaseController extends AbstractBaseController {
+ protected static final String RANGE_TIME_LINK = " - ";
+
@Autowired
protected HttpServletRequest request;
@Autowired
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 33cefe4..3367332 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -63,12 +63,24 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
+ public static void main(String[] args) {
+ String s = "2020-06-11 00:00:00 - 2020-07-15 00:00:00";
+ if (s.contains(" - ")) {
+ String[] split = s.split(" - ");
+ for (String s1 : split) {
+ System.out.println(s1);
+ }
+ }
+ }
+
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ } else if (String.valueOf(entry.getValue()).contains(RANGE_TIME_LINK)){
+ wrapper.ge(entry.getKey(), DateUtils.convert(String.valueOf(entry.getValue())));
} else {
wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
}
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 016c93f..0d07fcf 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -344,17 +344,7 @@
type: 'datetime'
});
layDate.render({
- elem: '#create_time\\>',
- type: 'datetime'
- });
- layDate.render({
- elem: '#create_time\\<',
- type: 'datetime'
- });
-
- //鏃ユ湡鏃堕棿鑼冨洿
- layDate.render({
- elem: '#test10'
+ elem: '.layui-laydate-range'
,type: 'datetime'
,range: true
});
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index bc2ad1c..ff60b7a 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -19,18 +19,10 @@
<input class="layui-input" type="text" name="mobile" placeholder="甯愬彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input" type="text" id="create_time>" name="create_time>" placeholder="璧峰鏃堕棿" autocomplete="off">
- </div>
- -
- <div class="layui-input-inline">
- <input class="layui-input" type="text" id="create_time<" name="create_time<" placeholder="缁堟鏃堕棿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" class="layui-input" id="test10" placeholder="鏃ユ湡鑼冨洿" autocomplete="off">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="鏃ユ湡鑼冨洿" autocomplete="off" style="width: 300px">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1