feature/simcards_checker #4
@ -266,7 +266,9 @@ public class SimCardController extends BasicController {
|
||||
int page,
|
||||
int limit,
|
||||
String searchType,
|
||||
String searchContent) {
|
||||
String searchContent,
|
||||
String startTime,
|
||||
String endTime) {
|
||||
try {
|
||||
Page<TrafficRecord> pageable = new Page<>(page, limit);
|
||||
QueryWrapper<TrafficRecord> queryWrapper = new QueryWrapper<>();
|
||||
@ -297,6 +299,13 @@ public class SimCardController extends BasicController {
|
||||
}
|
||||
}
|
||||
|
||||
if (!StringUtils.isEmpty(startTime)) {
|
||||
queryWrapper.ge("recordtime", startTime);
|
||||
}
|
||||
if (!StringUtils.isEmpty(endTime)) {
|
||||
queryWrapper.le("recordtime", endTime);
|
||||
}
|
||||
|
||||
queryWrapper.orderByDesc("recordtime");
|
||||
IPage<TrafficRecord> records = trafficRecordMapper.selectPage(pageable, queryWrapper);
|
||||
|
||||
|
||||
@ -34,6 +34,17 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<div class="layui-inline">
|
||||
<label class="layui-form-label">时间范围</label>
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" name="startTime" autocomplete="off" id="ID-laydate-start-date" class="layui-input" placeholder="开始日期">
|
||||
</div>
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" name="endTime" autocomplete="off" id="ID-laydate-end-date" class="layui-input" placeholder="结束日期">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<div class="layui-inline">
|
||||
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="searchSubmit"><i class="layui-icon"></i> 搜 索</button>
|
||||
@ -57,11 +68,12 @@
|
||||
|
||||
<script src="../lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
|
||||
<script th:inline="javascript">
|
||||
layui.use(['form', 'table','layer','element'], function () {
|
||||
layui.use(['form', 'table','layer','element','laydate'], function () {
|
||||
var table = layui.table
|
||||
,form = layui.form
|
||||
,layer = layui.layer
|
||||
,element = layui.element;
|
||||
,element = layui.element
|
||||
,laydate = layui.laydate;
|
||||
|
||||
var data_cols = [
|
||||
{field: 'deviceid', title: '设备号'},
|
||||
@ -80,6 +92,15 @@
|
||||
];
|
||||
|
||||
form.render();
|
||||
laydate.render({
|
||||
elem: '#ID-laydate-start-date',
|
||||
type: 'datetime'
|
||||
});
|
||||
laydate.render({
|
||||
elem: '#ID-laydate-end-date',
|
||||
type: 'datetime'
|
||||
});
|
||||
|
||||
table.render({
|
||||
elem: '#trafficRecordsTable',
|
||||
url: '/sim/traffic-records',
|
||||
@ -121,7 +142,9 @@
|
||||
}
|
||||
,where: {
|
||||
searchType: data.field.searchType,
|
||||
searchContent: data.field.searchContent
|
||||
searchContent: data.field.searchContent,
|
||||
startTime: data.field.startTime,
|
||||
endTime: data.field.endTime
|
||||
}
|
||||
,done: function(res) {
|
||||
layer.close(loadIndex);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user