From 0a68d1ae4a7e797342cf039a757fae4fc357faef Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 07 八月 2025 08:46:07 +0800
Subject: [PATCH] zjh202500807
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 bf6ae58..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
@@ -103,12 +103,13 @@
@Autowired
private ITjDwGroupingService tjDwGroupingService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@PostMapping("/importTemplate")
@ApiOperation(value = "瀵煎嚭excel琛ㄦā鏉�")
public void importTemplate(HttpServletResponse response) {
+ String value = configService.selectConfigByKey("path_filePath");
//鍘熸潵鐨勪笅杞芥ā鏉胯皟鐢ㄦ帴鍙�
try {
String base64String = PDFBinaryUtil.getPDFBinary(value + File.separator + "瑗垮畨璺嘲鏈虹數绉戞妧鏈夐檺鍏徃.xls");
@@ -177,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) {
@@ -696,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