From e9191e6d4485d94c75f76762b4926439503c20c6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 14 九月 2023 14:29:10 +0800
Subject: [PATCH] zjh 2023/09/14---1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 3e60259..aed625b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -81,7 +81,7 @@
     /**
      * 鏌ヨ浣撴棰勭害鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('reservation:reservation:list')")
+    //@PreAuthorize("@ss.hasPermi('reservation:reservation:list')")
     @GetMapping("/list")
     @ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
     public TableDataInfo list(TjReservation tjReservation) {
@@ -410,6 +410,10 @@
             delayService.reservation(tjReservation.getId());
             return AjaxResult.success("棰勭害鎴愬姛!!!");
         }
+        LambdaQueryWrapper<TbTransition> remove=new LambdaQueryWrapper<>();
+        remove.between(TbTransition::getCreateTime,DateUtil.offsetMinute(transitionService.getTbTransitionCreateTimeByCusId(tjReservation.getIdCard()),-1),new Date());
+        remove.eq(TbTransition::getCusId,tjReservation.getIdCard());
+        transitionService.remove(remove);
         return AjaxResult.error("棰勭害澶辫触");
     }
 

--
Gitblit v1.8.0