From 8720970864b887e34adc94e5bf5b19e709a1c042 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 04 一月 2024 18:05:10 +0800
Subject: [PATCH] zjh 2024/01/04--2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 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 d0c43c0..62dccb9 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);
@@ -583,7 +581,6 @@
pdfWriter.close();
outputStream.close();
- // TODO: 2023/3/29 鏌ヨ闄勪欢pdf 濡傚績鐢靛浘銆侀檮浠�
// LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
// rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
//// rtwq1.eq(TjReport::getTjNumber, tjNumber);
@@ -630,7 +627,6 @@
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 +tjNumber+ "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
@@ -1391,25 +1387,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