From 0e9613bcd6901b23323b41ac279ddb01cbde9f48 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 30 四月 2025 17:18:03 +0800
Subject: [PATCH] pdf生成增加失败撤回

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 0d5da1a..faa6972 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -235,8 +235,8 @@
 //        tjFlowingWater.setPayStasus(1L);
         TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
 
-        if (order.getFinishTime() != null) {
-            return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+        if (order.getPrintLastTime() != null) {
+            return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
         }
 
         TjCustomer customer = customerService.getById(order.getUserId());
@@ -333,6 +333,7 @@
                 Map<String, Object> map = new HashMap<>();
                 map.put("waterId", tjFlowingWater.getWaterId());
                 map.put("mobanId", reportService.getMoBanIds());
+                tjFlowingWaterService.getTjBlCall(order.getTjNumber());
                 return AjaxResult.success("鏀惰垂鎴愬姛", map);
             }
         }
@@ -388,8 +389,8 @@
 //        tjFlowingWater.setPayStasus(1L);
         TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
 
-        if (order.getFinishTime() != null) {
-            return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+        if (order.getPrintLastTime() != null) {
+            return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
         }
 
         TjCustomer customer = customerService.getById(order.getUserId());

--
Gitblit v1.8.0