From 9e8d21e2d0e9b1caccdb59e6e1acce52adb7a3e1 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 25 七月 2025 10:01:48 +0800 Subject: [PATCH] zjh20250725 --- 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 03b1e22..3911eef 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,7 +178,8 @@ @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) { @@ -697,9 +698,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