From 4b3f00ba8d230edbf96c4ea4ff2f2d82e0b20511 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 13 十二月 2023 15:19:15 +0800
Subject: [PATCH] 11
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 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 e393cfa..fc62ae9 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
@@ -581,24 +581,28 @@
rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
// rtwq1.eq(TjReport::getTjNumber, tjNumber);
TjReport one11111 = tjReportService.getOne(rtwq1);
- String report1 = one11111.getReport();
- PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
+ 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, "蹇冪數鍥�");
// rtwq.eq(TjReport::getTjNumber, tjNumber);
TjReport one1111 = tjReportService.getOne(rtwq);
- String report = one1111.getReport();
- PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
+ if(null !=one1111){
+ String report = one1111.getReport();
+ PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
+ }
LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
rtwq12.eq(TjReport::getType, "闄勪欢");
// rtwq12.eq(TjReport::getTjNumber, tjNumber);
TjReport one111112 = tjReportService.getOne(rtwq12);
- String report12 = one111112.getReport();
- PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
-
-
+ if(null !=one111112){
+ String report12 = one111112.getReport();
+ 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 outputPath1 = value + "\\";
@@ -1370,4 +1374,33 @@
return all;
}
+
+ @GetMapping("/reportHistory")
+ @ApiOperation(value = "鍘嗗彶鎶ュ憡")
+ public AjaxResult reportHistory(Long cusId) {
+ List<TjReport> res=new ArrayList<>();
+ LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
+ wqq.like(TjOrder::getUserId, cusId);
+ List<TjOrder> orderList = tjOrderService.list(wqq);
+ if (orderList!=null){
+ 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));
+ }
+ }
+ return AjaxResult.success(res);
+ }
+ return AjaxResult.error("鏆傛棤鍘嗗彶鎶ュ憡");
+ }
+
+
+
+
+
+
+
+
}
--
Gitblit v1.8.0