From e6682c9434f133a25660110e39a1f0f993267a65 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 27 七月 2023 14:03:55 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/phone/TicketController.java | 2 +-
src/main/java/com/boying/controller/OrderRecordController.java | 2 +-
src/main/java/com/boying/controller/TicketBlackController.java | 9 ++++++---
src/main/java/com/boying/controller/WhiteListController.java | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index 7f7204a..19fa916 100644
--- a/src/main/java/com/boying/controller/OrderRecordController.java
+++ b/src/main/java/com/boying/controller/OrderRecordController.java
@@ -53,7 +53,7 @@
wrapper.lambda()
.eq(OrderRecord::getType,orderRecord.getType())
.eq(OrderRecord::getStatus,1)
- .eq(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
+ .like(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
.isNotNull(OrderRecord::getPayCode)
.orderByDesc(OrderRecord::getCreateTime);
Page page1 = orderRecordService.page(page, wrapper);
diff --git a/src/main/java/com/boying/controller/TicketBlackController.java b/src/main/java/com/boying/controller/TicketBlackController.java
index 3a4aaf5..15a5e72 100644
--- a/src/main/java/com/boying/controller/TicketBlackController.java
+++ b/src/main/java/com/boying/controller/TicketBlackController.java
@@ -47,7 +47,7 @@
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(TicketBlack::getBlackType,0)
- .eq(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
+ .like(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
.eq(ticket.getIsActive() != null,TicketBlack::getIsActive,ticket.getIsActive())
.orderByDesc(TicketBlack::getCreateTime);
return R.ok(ticketBlackService.page(page, wrapper));
@@ -84,8 +84,11 @@
@PostMapping("/delete")
public Object delete(Long id){
TicketBlack ticket =ticketBlackService.getById(id);
- ticketBlackService.saveOrUpdate(ticket);
- return R.ok("鎿嶄綔鎴愬姛");
+ if(ticket!=null){
+ ticketBlackService.removeById(ticket);
+ return R.ok("鎿嶄綔鎴愬姛");
+ }
+ return R.failed("鏈壘鍒拌杞�");
}
@PostMapping("/updateById")
diff --git a/src/main/java/com/boying/controller/WhiteListController.java b/src/main/java/com/boying/controller/WhiteListController.java
index c914ff9..31d5e1a 100644
--- a/src/main/java/com/boying/controller/WhiteListController.java
+++ b/src/main/java/com/boying/controller/WhiteListController.java
@@ -27,7 +27,7 @@
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
.orderByDesc(WhiteList::getId)
- .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
+ .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
Page<WhiteList> page1 = whiteListService.page(page, wrapper);
for (WhiteList record : page1.getRecords()) {
if(record.getParkId() != null){
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index e34b8c2..902d4c8 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -77,7 +77,7 @@
public Object findPage(Page page, Ticket ticket){
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
+ .like(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
.eq(ticket.getType() != null,Ticket::getType,ticket.getType())
.eq(ticket.getViolationTypeId() != null,Ticket::getViolationTypeId,ticket.getViolationTypeId())
.eq(ticket.getPayStatus() != null,Ticket::getPayStatus,ticket.getPayStatus())
--
Gitblit v1.9.1