From 4e5f835cf0e4b4f0de64fc93d385506b05ced9cc Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 25 十二月 2023 18:10:47 +0800
Subject: [PATCH] zjh 本地 2023/12/25 -4
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 22 ++++++++++++++++++----
1 files changed, 18 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 3e60259..6a34d68 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
@@ -16,6 +16,7 @@
import com.ltkj.common.excelConfig.ExcelUtils;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
+import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.ConfirmDto;
@@ -27,6 +28,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;
@@ -74,14 +76,15 @@
@PostMapping("/importTemplate")
@ApiOperation(value = "瀵煎嚭excel琛ㄦā鏉�")
public void importTemplate(HttpServletResponse response) {
- ExcelUtils.exportTemplate(response, "浣撴棰勭害Excel妯℃澘", TjReservation.class);
+// ExcelUtils.exportTemplate(response, "浣撴棰勭害Excel妯℃澘", TjReservation.class);
+
}
/**
* 鏌ヨ浣撴棰勭害鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('reservation:reservation:list')")
+ //@PreAuthorize("@ss.hasPermi('reservation:reservation:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
@@ -410,6 +413,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("棰勭害澶辫触");
}
@@ -419,7 +426,7 @@
*/
@GetMapping(value = "/{id}")
@ApiOperation(value = "鏍规嵁棰勭害id鑾峰彇棰勭害璇︽儏")
- public AjaxResult getInfo(@PathVariable("id") @ApiParam(value = "棰勭害id") Integer id) {
+ public AjaxResult getInfo(@PathVariable("id") @ApiParam(value = "棰勭害id") String id) {
TjReservation tjReservation = tjReservationService.selectTjReservationById(id);
if (null != tjReservation) {
if (null != tjReservation.getPacId()) {
@@ -486,9 +493,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 +536,7 @@
@PostMapping("/newReservationConfirm")
@ApiOperation(value = "鍥綋棰勭害纭鎺ュ彛 (鏂扮増鏈�)")
+ @Transactional
public AjaxResult newReservationConfirm(@RequestBody ConfirmDto dto) {
//棰勭害鐨勬墍鏈変汉
List<TjReservation> rightList = dto.getReservations();
@@ -540,7 +553,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