From bda1ce873514c0848c4ad76bdd2274f01ab5dcc1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 11 八月 2025 08:48:08 +0800
Subject: [PATCH] zjh202500811
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 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 03b1e22..b934500 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
@@ -178,15 +178,9 @@
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
startPage();
- tjReservation.setIsExpire(2);
+// tjReservation.setIsExpire(2);
+ if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2);
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
-// if(null !=list && list.size()>0){
-// for (TjReservation reservation : list) {
-// reservation.setName(MatchUtils.hideCusName(reservation.getName()));
-// reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
-// reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
-// }
-// }
return getDataTable(list);
}
@@ -697,9 +691,9 @@
if (tjReservation.getIsExpire() == 1) {
return AjaxResult.error("棰勭害宸茶繃鏈熶笉鍙慨鏀�");
}
- tjReservation.setIdCard(reservation.getIdCard());
- tjReservation.setPhoe(reservation.getPhoe());
- tjReservation.setName(reservation.getName());
+// tjReservation.setIdCard(reservation.getIdCard());
+// tjReservation.setPhoe(reservation.getPhoe());
+// tjReservation.setName(reservation.getName());
if (tjReservationService.updateById(tjReservation)) {
taskService.removeTask(new TjReservationTask(tjReservation.getId()));
taskService.addTask(new TjReservationTask(tjReservation.getId(),
--
Gitblit v1.8.0