From 6a86b993e89ce5d90c8707f2855aa1fe183d4b73 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 15 十一月 2023 09:33:10 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/TicketBlackController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/boying/controller/TicketBlackController.java b/src/main/java/com/boying/controller/TicketBlackController.java
index 3a4aaf5..c71476c 100644
--- a/src/main/java/com/boying/controller/TicketBlackController.java
+++ b/src/main/java/com/boying/controller/TicketBlackController.java
@@ -46,8 +46,7 @@
public Object findPage(Page page, TicketBlack ticket){
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 +83,14 @@
@PostMapping("/delete")
public Object delete(Long id){
TicketBlack ticket =ticketBlackService.getById(id);
- ticketBlackService.saveOrUpdate(ticket);
- return R.ok("鎿嶄綔鎴愬姛");
+ if(ticket!=null){
+ if(ticket.getViolationCount() >0 ){
+ return R.failed("璇峰厛瑙ｅ喅杩濈珷");
+ }
+ ticketBlackService.removeById(ticket);
+ return R.ok("鎿嶄綔鎴愬姛");
+ }
+ return R.failed("鏈壘鍒拌杞�");
}
@PostMapping("/updateById")
--
Gitblit v1.9.1