From c4415aad8cb271bb19024607002d5596218e3a94 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 26 十二月 2023 14:50:59 +0800
Subject: [PATCH] zjh 本地 2023/12/26 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 c599e27..d0c43c0 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
@@ -90,7 +90,8 @@
@Autowired
private ISysDictDataService dictDataService;
-
+ @Resource
+ private ITbTransitionService transitionService;
// /* *//**
// * 鏌ヨ浣撴鎶ュ憡瀛樺偍鍒楄〃
@@ -270,6 +271,7 @@
if (null != tjOrder) {
LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ TjReportTemplate reportTemplate =null;
if (tjOrder.getTjCategory()!=null){
//鏌ヨ瀛楀吀
LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
@@ -290,12 +292,13 @@
}else {
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
}
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
+ }else {
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
}
-
-
- tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
- TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
- String template = one1.getTemplate();
+ String template = reportTemplate.getTemplate();
String userId = SecurityUtils.getLoginUser().getUsername();
PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
@@ -427,11 +430,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();
@@ -581,14 +584,14 @@
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, "蹇冪數鍥�");
@@ -608,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,7 +633,7 @@
//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");
@@ -649,6 +652,8 @@
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.success("PDF瀵煎嚭澶辫触");
+ }finally {
+ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjOrder.getCardId());
}
}
}
--
Gitblit v1.8.0