From 906328ba3f842f5f86cb5bd60e09a8a7f6d2ac93 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十月 2023 08:32:18 +0800
Subject: [PATCH] zjh 2023/10/12--2

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java |   10 +++++++++-
 1 files changed, 9 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 aed625b..410ba0b 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
@@ -27,6 +27,7 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import com.ltkj.common.core.controller.BaseController;
 import com.ltkj.common.core.domain.AjaxResult;
@@ -490,9 +491,14 @@
     @PostMapping("/tjReappoint")
     @ApiOperation(value = "浣撴棰勭害淇敼鎺ュ彛")
     public AjaxResult tjReappoint(@RequestBody TjReservation tjReservation) {
+        TjReservation reservation = tjReservationService.getById(tjReservation.getId());
+
         if (tjReservation.getIsExpire() == 1) {
             return AjaxResult.error("棰勭害宸茶繃鏈熶笉鍙慨鏀�");
         }
+        tjReservation.setIdCard(reservation.getIdCard());
+        tjReservation.setPhoe(reservation.getPhoe());
+        tjReservation.setName(reservation.getName());
         if (tjReservationService.updateById(tjReservation)) {
             return AjaxResult.success("鎿嶄綔鎴愬姛");
         }
@@ -528,6 +534,7 @@
 
     @PostMapping("/newReservationConfirm")
     @ApiOperation(value = "鍥綋棰勭害纭鎺ュ彛 (鏂扮増鏈�)")
+    @Transactional
     public AjaxResult newReservationConfirm(@RequestBody ConfirmDto dto) {
         //棰勭害鐨勬墍鏈変汉
         List<TjReservation> rightList = dto.getReservations();
@@ -544,7 +551,8 @@
         TjDwDept dwDept = dwDeptService.getById(dto.getDwDeptId());
 
         //寮傛鏁版嵁
-        asyncService.addNewReservationConfirm(rightList);
+//        asyncService.addNewReservationConfirm(rightList);
+        asyncService.saveNewReservationConfirm(rightList);
 
         //鍥綋浜烘暟鍚堣浠锋牸
         BigDecimal compPay=new BigDecimal("0.00");

--
Gitblit v1.8.0