From 1a39aa599439fc182b6fd9c816d440263104406c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 27 Dec 2023 13:28:43 +0800
Subject: [PATCH] 'commit'

---
 .../06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf  | Bin 115030 -> 115030 bytes
 .../b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf  | Bin 54324 -> 54324 bytes
 .../Collect/Controller/CollectController.java |  16 ++++++++--------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf b/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf
index cfa7ee918d8560b97b1e611f9231364f88d50d19..cb427cac2e5de87a178fb0959595f56f4a9cd24e 100644
GIT binary patch
delta 105
zcmccC#D1-beZ$RqR#PKW1B1!;>Lnno=HK<(f7dhqa&R=Xa5OVCG%_+bG&M6eGc|KI
zb2c}2HE=Ytv;^`k>}-sjEnJ+;&0SsHj7-doO$?lX@&+abmWGbzE{?7ij?>K!GAaN7
D8E_ty

delta 105
zcmccC#D1-beZ$RqRudC*Bg4t}>Lnno=HK<(f7dhqa&UCBG<Pv`F|@FBGd43eGc|KI
zb2c|NHaBrIG;%R=a<#KDFmrS^FmkmpGc__av@|ibG<36cG%zr9a&&SwHgj~HZg!AS
F0RSxD9?t*(

diff --git a/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf b/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf
index dfa099de2447e6feaca736837b3f448c0b837dd7..95d257464fce5a0e7a8b3e256d9c824121aca82d 100644
GIT binary patch
delta 101
zcmdn8f_cjd<_$0PSWOKr49zFM)02R(HgoHrSmNYpZfff2W@7H>>f~f*Y-VcaZ02lk
zY~f^SYG7<)X<=YzV{Gc|>SW?(W@c_=Zena=?qp)<Yzbr-SXdewnVA|)7QG@50Pb`f
AC;$Ke

delta 101
zcmXBGI}SiV5CG6ZRBDON4cIZWGb0hn{#?)%6iSIbgaf#Q#u*e|_3~ciy*Qq(B$9#F
zw`=~LRex>Xj!Oh}3BtmRY&mcc)G-M<G1ko!I?JpESrQNsDhfq0>LU)~3D){<KkXwM
AHvj+t

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
index e1f63b57..c9286510 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -29,7 +29,9 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import javax.servlet.ServletOutputStream;
 import java.io.*;
+import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.*;
 
@@ -800,6 +802,7 @@ public class CollectController extends Controller {
 
         //文件名称
         String excel_filename = job_name + "【" + bureau_name + "】.xlsx";
+        String pdf_filename = job_name + "【" + bureau_name + "】.pdf";
 
         //1、找到upload_excel_filename_user
         Record record = cm.viewFilledJob(job_id, bureau_id);
@@ -827,14 +830,11 @@ public class CollectController extends Controller {
         if (type_id == 2) {
             String pdfPath = excelPath.replace(".xlsx", ".pdf");
             AsposeUtil.xls2pdf(excelPath, pdfPath);
-            /**
-             * 解决java.io.IOException: UT010029: Stream is closed报错
-             * 由于HttpServlet的request和response里的流都只能读写一次，关掉就没有了, 所以不能使用该方法
-             */
-            OutputStream outputStream = getResponse().getOutputStream();
-            outputStream.write(FileUtil.readBytes(pdfPath));
-            outputStream.flush();
-            renderNull();
+            Kv kv = Kv.create();
+            kv.set("success", true);
+            kv.set("pdf_name", pdf_filename);
+            kv.set("pdf_url", FileUtil.getName(pdfPath));
+            renderJson(kv);
         }
     }