From c2b7923a0b3c5aa88496238c9b4f362ead13fa5d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 09:00:01 +0800
Subject: [PATCH] zjh20241205-2

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 91ccef7..d124182 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2631,7 +2631,7 @@
             TjReport tjReport = new TjReport();
             tjReport.setTjNumber(String.valueOf(tjNumber));
             tjReport.setPath(urlValue + outputFileName1);
-            String outputPath1 = value + "\\";
+            String outputPath1 = value + File.separator;
             String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
             tjReport.setReport(pdfBinary);
             tjReport.setType("浣撴鎶ュ憡");
@@ -2774,6 +2774,7 @@
 //            if (null != payByTjNum) {
 //                return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
 //            }
+            if(null !=order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
             tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
             tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
             remarkService.deletedOrderRemarkByTjNum(tjNum);

--
Gitblit v1.8.0