From bd992b57fe7cc9ccc54affc75d3c869b15261b92 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期二, 23 一月 2024 09:23:26 +0800
Subject: [PATCH] 报告 异常
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 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 603b14f..1582d46 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
@@ -229,7 +229,6 @@
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
- // TODO: 2023/3/21 灏嗘ā鏉夸繚瀛樺埌鏁版嵁搴� 涓�娆′娇鐢ㄥ悗娉ㄩ噴
// String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\浣撴妯℃澘4.pdf");
// TjReportTemplate tem = new TjReportTemplate();
// tem.setName("浣撴鎶ュ憡妯℃澘4");
@@ -238,7 +237,6 @@
// tem.setFlag("1");
// tem.setOpen("0");
// reportTemplateService.save(tem);
-// // TODO: 2023/3/21 灏嗗績鐢靛浘淇濆瓨鍒版暟鎹簱 涓�娆′娇鐢ㄥ悗娉ㄩ噴 鏆傛椂鐢ㄤ簬娴嬭瘯
// String base64String2 = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\蹇冪數鍥�1.pdf");
// TjReport tem2 = new TjReport();
// tem2.setTjNumber(tjNumber);
@@ -406,12 +404,15 @@
data.put("docname", tjOrder.getCheckDoctor());
}
//寮傚父椤圭洰
- data.put("yichang", "銆�1銆戝眻鍏変笉姝n" +
- "銆�2銆戞墎妗冧綋鑲モ激\n" +
- "銆�3銆戜綋閲嶆寚鏁板饩糪n" +
- "銆�4銆戔編鑴傚紓甯革紙鎬昏儐鍥洪唶澧炩炯锛涒舰娌逛笁閰饩硷級\n" +
- "銆�5銆懳�-饩曟皑閰拌浆绉婚叾澧炩炯锛涘ぉ饣斿啲姘ㄩ吀姘ㄥ熀杞Щ閰跺饩硷紱涓欐皑閰告皑鍩鸿浆绉婚叾澧炩炯\n" +
- "銆�6銆戣交饩勪腑搴﹁剛鑲倽");
+// data.put("yichang", "銆�1銆戝眻鍏変笉姝n" +
+// "銆�2銆戞墎妗冧綋鑲モ激\n" +
+// "銆�3銆戜綋閲嶆寚鏁板饩糪n" +
+// "銆�4銆戔編鑴傚紓甯革紙鎬昏儐鍥洪唶澧炩炯锛涒舰娌逛笁閰饩硷級\n" +
+// "銆�5銆懳�-饩曟皑閰拌浆绉婚叾澧炩炯锛涘ぉ饣斿啲姘ㄩ吀姘ㄥ熀杞Щ閰跺饩硷紱涓欐皑閰告皑鍩鸿浆绉婚叾澧炩炯\n" +
+// "銆�6銆戣交饩勪腑搴﹁剛鑲倽");
+
+ //寮傚父椤圭洰
+ data.put("yichang", "");
// 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
for (String key : data.keySet()) {
@@ -430,11 +431,11 @@
//璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
document.setMargins(70, 70, 40, 40);
//鐢熸垚pdf鐨勪綅缃互鍙婂悕绉�
- String fileName = value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
+ String fileName = value + "\\" + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
- pdfWriter.setPageEvent(new MyHeaderFooter());// 椤电湁椤佃剼
+ //pdfWriter.setPageEvent(new MyHeaderFooter());// 椤电湁椤佃剼
document.open();
@@ -583,15 +584,14 @@
pdfWriter.close();
outputStream.close();
- // TODO: 2023/3/29 鏌ヨ闄勪欢pdf 濡傚績鐢靛浘銆侀檮浠�
- LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
- rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
-// rtwq1.eq(TjReport::getTjNumber, tjNumber);
- TjReport one11111 = tjReportService.getOne(rtwq1);
- if(null !=one11111){
- String report1 = one11111.getReport();
- PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
- }
+// LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
+// rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
+//// rtwq1.eq(TjReport::getTjNumber, tjNumber);
+// TjReport one11111 = tjReportService.getOne(rtwq1);
+// if(null !=one11111){
+// String report1 = one11111.getReport();
+// PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+// }
LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
rtwq.eq(TjReport::getType, "蹇冪數鍥�");
@@ -611,7 +611,7 @@
PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
}
//鍚堝苟
- String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + userId + "鍖诲鍚嶈瘝.pdf", value + "\\" + userId + "闄勪欢.pdf", value + "\\" + userId + "蹇冪數鍥�.pdf"};
+ String[] files1 = {value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + "\\" + userId + tjNumber+"浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf", value + "\\" + userId + "闄勪欢.pdf", value + "\\" + userId + "蹇冪數鍥�.pdf"};
String outputPath1 = value + "\\";
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
@@ -630,10 +630,9 @@
tjReport.setType("浣撴鎶ュ憡");
tjReportService.save(tjReport);
- //TODO 2023/2/3 16:21 鐢熸垚浣撴鎶ュ憡pdf鍚庡垹闄ゆ湰鍦版枃浠�
//FileUtil.del(value + "\\" + tjNumber + "浣撴鎶ュ憡.pdf");
//FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
- //FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
+ //FileUtil.del(value + "\\" + userId +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
//FileUtil.del(value + "\\" + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
//FileUtil.del(value + "\\" + userId + "蹇冪數鍥�.pdf");
@@ -1391,25 +1390,20 @@
LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
wqq.like(TjOrder::getUserId, cusId);
List<TjOrder> orderList = tjOrderService.list(wqq);
- if (orderList!=null){
+ if (orderList!=null && orderList.size()>0){
for (TjOrder tjOrder : orderList) {
if (tjOrder!=null){
LambdaQueryWrapper<TjReport> wq = new LambdaQueryWrapper<>();
wq.eq(TjReport::getTjNumber, tjOrder.getTjNumber());
wq.eq(TjReport::getType,"浣撴鎶ュ憡");
- res.add(tjReportService.getOne(wq));
+ TjReport one = tjReportService.getOne(wq);
+ if(null !=one){
+ res.add(one);
+ }
}
}
return AjaxResult.success(res);
}
return AjaxResult.error("鏆傛棤鍘嗗彶鎶ュ憡");
}
-
-
-
-
-
-
-
-
}
--
Gitblit v1.8.0