自动化立体仓库 - WMS系统
#
luxiaotao1123
2020-06-23 653aa18b7298cf09e74e144cc8dc093a79cfbfba
#
4个文件已修改
40 ■■■■■ 已修改文件
src/main/java/com/zy/common/web/BaseController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/system/controller/UserController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/user/user.js 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/user/user.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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()));
            }
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
    });
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">