From cb7ba105e4d14d1c2d6fb9db287bc4cc58417c1b Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 22 十二月 2023 14:33:57 +0800
Subject: [PATCH] 1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 9 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..c599e27 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
@@ -444,7 +444,11 @@
                         LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
                         wqqq.eq(TjProject::getProId, entry.getKey().getProId());
                         TjProject one11 = projectService.getOne(wqqq);
-                        if ("1".equals(one11.getProCheckMethod())) {
+                        //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+                        if ("N".equals(one11.getNeedReport())){
+                            continue;
+                        }
+                        if ("1".equals(one11.getResultType())) {
                             String titleName = one11.getProName();
                             // 璁剧疆鏍囬瀛椾綋鏍峰紡
                             Font titleFonts = PdfUtils.setFont(9);
@@ -581,24 +585,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 +1378,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