From bdd2b5c36983d461416eec89d2a9feb1176b71df Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 27 六月 2024 15:45:31 +0800
Subject: [PATCH] zjh 本地 2024/06/27 --1

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

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 06b92e0..eda4563 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -354,7 +354,7 @@
                     Date finishTime = tjOrder.getFinishTime();
                     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String ksrq = dateFormat.format(createTime);
-                    String jsrq = dateFormat.format(finishTime);
+                    String jsrq = dateFormat.format(new Date());
                     HashMap<String, Object> params = new HashMap<>();
                     params.put("his_registration_id", hisRegistrationId);
                     params.put("ksbm", "");
@@ -364,7 +364,17 @@
                     params.put("pagecount", 100);
                     params.put("page", 1);
                     HashMap<String, Object> map = new HashMap<>();
-                    return hisPDFUtil.execHisRequest(map, params, tjOrder, reportTemplate);
+                    LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+                    wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
+                    TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+//                    return hisPDFUtil.execHisRequest(map, params, tjOrder, reportTemplate);
+                    try {
+                        return hisPDFUtil.hisPDF(tjOrder,tjCustomer,reportTemplate);
+                    } catch (DocumentException e) {
+                        logger.error("鐢熸垚鎶ュ憡寮傚父");
+                        e.printStackTrace();
+                        return AjaxResult.error("鐢熸垚鎶ュ憡寮傚父");
+                    }
                 } else {
                     return AjaxResult.error("璇峰厛鎬绘");
                 }
@@ -1334,7 +1344,7 @@
                     e.printStackTrace();
                     return AjaxResult.success("PDF瀵煎嚭澶辫触");
                 } finally {
-                    transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
+//                    transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
                 }
             }
         }

--
Gitblit v1.8.0