From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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..8a384d3 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));
}
}
@@ -742,11 +743,11 @@
LambdaQueryWrapper<TjGroupingPro> wq = new LambdaQueryWrapper<>();
wq.eq(TjGroupingPro::getGroupingId, groupingId);
List<TjGroupingPro> proList = groupingProService.list(wq);
- if (null != proList && proList.size() > 0) {
+ if (null != proList && !proList.isEmpty()) {
for (TjGroupingPro groupingPro : proList) {
TjProject project = projectService.getById(groupingPro.getProId());
if (null != project) {
- if (project.getProType() == null || project.getProType().equals("")) {
+ if (project.getProType() == null || project.getProType().isEmpty()) {
groupingPro.setProType("2");
} else {
groupingPro.setProType(project.getProType());
@@ -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