From 5ce469c9e3bdf7107d49a5b4886cdd5fed67d9aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 08 四月 2025 18:00:38 +0800
Subject: [PATCH] zjh20250408

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 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 dc8cccb..65f45c3 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
@@ -1736,21 +1736,17 @@
     public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
         TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
         TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
-        LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
-        we.eq(TjReport::getTjNumber, tjNumber);
-        we.eq(TjReport::getType, "浣撴鎶ュ憡");
-        TjReport one = tjReportService.getOne(we);
-        if (one == null) {
-            return;
-        }
-        String userId = SecurityUtils.getLoginUser().getUsername();
-        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
-        String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+//        LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
+//        we.eq(TjReport::getTjNumber, tjNumber);
+//        we.eq(TjReport::getType, "浣撴鎶ュ憡");
+//        TjReport one = tjReportService.getOne(we);
+//        if (one == null) {
+//            return;
+//        }
+//        String userId = SecurityUtils.getLoginUser().getUsername();
+//        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+        String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
         File f = new File(filePath);
-        if (filePath.isEmpty()) {
-            System.out.println("鏂囦欢涓嶅瓨鍦紒");
-            return;
-        }
         BufferedInputStream br = null;
         OutputStream out = null;
         FileInputStream fileInputStream = null;
@@ -1767,13 +1763,13 @@
                 String contentType = u.openConnection().getContentType();
                 response.setContentType(contentType);
                 response.setHeader("Content-Disposition", "inline;filename="
-                        + userId + tjNumber + ".pdf");
+                        + tjCustomer.getCusId() + tjNumber + ".pdf");
             } else {
                 // 绾笅杞芥柟寮�
                 response.setContentType("application/x-msdownload");
                 response.setContentType("application/pdf;charset=utf-8");
                 response.setHeader("Content-Disposition", "attachment;filename="
-                        + userId + tjNumber + ".pdf");
+                        + tjCustomer.getCusId() + tjNumber + ".pdf");
             }
             out = response.getOutputStream();
             while ((len = br.read(bs)) > 0) {

--
Gitblit v1.8.0