diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/SimCardController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/SimCardController.java index 54ed874c..e09e45da 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/SimCardController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/SimCardController.java @@ -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 pageable = new Page<>(page, limit); QueryWrapper 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 records = trafficRecordMapper.selectPage(pageable, queryWrapper); diff --git a/sec-beidou/src/main/resources/templates/page/sim_traffic_records.html b/sec-beidou/src/main/resources/templates/page/sim_traffic_records.html index 34868e7c..25d2d386 100644 --- a/sec-beidou/src/main/resources/templates/page/sim_traffic_records.html +++ b/sec-beidou/src/main/resources/templates/page/sim_traffic_records.html @@ -34,6 +34,17 @@ +
+
+ +
+ +
+
+ +
+
+
@@ -57,11 +68,12 @@