From 8cde7ee1143bae70eb68d2b75f572d5b4dbadf98 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 12 十月 2023 17:47:00 +0800
Subject: [PATCH] zjh 2023/10/12--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 16 ++++++++++++++--
1 files changed, 14 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 3e60259..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;
@@ -81,7 +82,7 @@
/**
* 鏌ヨ浣撴棰勭害鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('reservation:reservation:list')")
+ //@PreAuthorize("@ss.hasPermi('reservation:reservation:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
@@ -410,6 +411,10 @@
delayService.reservation(tjReservation.getId());
return AjaxResult.success("棰勭害鎴愬姛!!!");
}
+ LambdaQueryWrapper<TbTransition> remove=new LambdaQueryWrapper<>();
+ remove.between(TbTransition::getCreateTime,DateUtil.offsetMinute(transitionService.getTbTransitionCreateTimeByCusId(tjReservation.getIdCard()),-1),new Date());
+ remove.eq(TbTransition::getCusId,tjReservation.getIdCard());
+ transitionService.remove(remove);
return AjaxResult.error("棰勭害澶辫触");
}
@@ -486,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("鎿嶄綔鎴愬姛");
}
@@ -524,6 +534,7 @@
@PostMapping("/newReservationConfirm")
@ApiOperation(value = "鍥綋棰勭害纭鎺ュ彛 (鏂扮増鏈�)")
+ @Transactional
public AjaxResult newReservationConfirm(@RequestBody ConfirmDto dto) {
//棰勭害鐨勬墍鏈変汉
List<TjReservation> rightList = dto.getReservations();
@@ -540,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