From 552c700f584700316e8d1919dd1ad7f551c53ec4 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 12 十一月 2024 10:03:22 +0800
Subject: [PATCH] fix ： 新增日统计接口
---
src/main/java/com/boying/controller/WhiteListController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/boying/controller/WhiteListController.java b/src/main/java/com/boying/controller/WhiteListController.java
index c49ada2..6fba87b 100644
--- a/src/main/java/com/boying/controller/WhiteListController.java
+++ b/src/main/java/com/boying/controller/WhiteListController.java
@@ -13,6 +13,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
@RestController
@RequestMapping("ffzf/whiteList")
@@ -27,8 +31,8 @@
public Object findPage(Page page, String carNo) {
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .orderByDesc(WhiteList::getId)
- .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
+ .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
+ .orderByDesc(WhiteList::getId);
Page<WhiteList> page1 = whiteListService.page(page, wrapper);
for (WhiteList record : page1.getRecords()) {
if(record.getParkId() != null){
@@ -39,11 +43,19 @@
}
@PostMapping("/findPageNew")
- public Object findPageNew(Page page, String carNo) {
+ public Object findPageNew(Page page, String carNo,Integer type,String date) throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if(StringUtils.isNotBlank(date)){
+ System.out.println(date);
+ Date parse = sdf.parse(date);
+ date = sdf.format(parse);
+ }
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
.orderByDesc(WhiteList::getId)
- .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
+ .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
+ .eq(type!=null,WhiteList::getType,type)
+ .le(StringUtils.isNotBlank(date),WhiteList::getEndTime,date);
Page<WhiteList> page1 = whiteListService.page(page, wrapper);
for (WhiteList record : page1.getRecords()) {
if(StringUtils.isNotBlank(record.getParkIds())){
--
Gitblit v1.9.1