From e4b5fef59ea127c76f46ba785c19e9da46c9514d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 16 十二月 2024 18:12:13 +0800
Subject: [PATCH] zjh202412016
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 61b2f1f..a9c46f2 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
@@ -697,7 +697,8 @@
TjReservation reservation = tjReservationService.getById(id);
if (null != reservation && reservation.getIsExpire() == 2) {
if (tjReservationService.removeById(id)) {
- transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard()));
+ transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())
+ .isNull(TbTransition::getTjNum));
taskService.removeTask(new TjReservationTask(id));
}
}
@@ -912,7 +913,7 @@
return AjaxResult.error("姝よ韩浠借瘉鍙�: "+reservation.getIdCard()+" 閲嶅,璇锋牳瀵瑰悗涓婁紶!");
}
-
+ reservation.setName(reservation.getName().replaceAll("銆�","").replaceAll(" ",""));
ids.add(reservation.getIdCard());
TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());
--
Gitblit v1.8.0