From c15fce36365c4e6c75615cf64b6c932b941312c4 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 04 三月 2024 18:07:21 +0800
Subject: [PATCH] zjh 本地 2024/03/4 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 8f5c161..e0aade3 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
@@ -747,6 +747,7 @@
wq1.eq(TjOrder::getTjNumber, tjNumber);
TjOrder one = tjOrderService.getOne(wq1);
+/*
//鎷垮埌浣撴璁板綍鐨刼rderid锛屾煡鍑洪」鐩缁嗕俊鎭�
LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
@@ -754,7 +755,7 @@
wq.ne(TjOrderDetail::getTjStatus, 0);
wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
- wq.notIn(TjOrderDetail::getProId,projectService.getNneedReprotProId());
+// wq.notIn(TjOrderDetail::getProId,projectService.getNneedReprotProId());
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
//閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
@@ -765,6 +766,7 @@
tjOrderDetail.setProject(tjProject);
}
}
+*/
LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
wq22.eq(TjCustomer::getCusId, one.getUserId());
@@ -781,7 +783,7 @@
printReport.put(tjOrderRemark,null);
}
- extracted(printReport, tjOrderDetails, customer);
+ extracted(printReport,one, customer);
return printReport;
}
@@ -842,10 +844,16 @@
return printReport;
}
- private void extracted(Map<TjOrderRemark, List<TjPdfVO>> printReport, List<TjOrderDetail> tjOrderDetails, TjCustomer customer) {
+ private void extracted(Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
+// TjOrder one = tjOrderService.getOrderByTjNum(entry.getKey().getTjNumber());
+ List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(),entry.getKey().getProId());
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+ if (null != tjProject) {
+ tjOrderDetail.setProject(tjProject);
+ }
if (null == tjOrderDetail.getProject()) {
System.out.println("'''''''''''''''''''''''''''''''''''" + tjOrderDetail.getOrderDetailId());
}
--
Gitblit v1.8.0