From fcc5d56c4fa7b269d96b8ef66a527fa6a7c90450 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 28 二月 2024 19:10:18 +0800
Subject: [PATCH] zjh 本地 2024/02/28 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 fe07dd0..ee8ed63 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
@@ -724,6 +724,7 @@
//20230323鍒ゆ柇椤圭洰宸叉
wq.ne(TjOrderDetail::getTjStatus, 0);
wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
+ wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
//閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
@@ -741,11 +742,12 @@
LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
wqq.ne(TjOrderRemark::getDeptId,"241");
+ wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
- printReport.put(tjOrderRemark,new ArrayList<TjPdfVO>());
+ printReport.put(tjOrderRemark,null);
}
extracted(printReport, tjOrderDetails, customer);
@@ -757,7 +759,6 @@
public Map<TjOrderRemark, List<TjPdfVO>> addHuaYanTable(String tjNumber) {
//鍒涘缓map 閿负鐖堕」鐩� 鍊间负瀛愰」鐩泦鍚�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
-
//鏌ュ埌璇ュ鎴风殑浣撴璁板綍
// LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
// wq1.eq(TjOrder::getTjNumber, tjNumber);
@@ -771,7 +772,6 @@
// wq.eq(TjOrderDetail::getProId,projectService.getHuaYanProId());
// List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber);
-
//閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
//閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
// for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -791,20 +791,20 @@
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
- printReport.put(tjOrderRemark, new ArrayList<TjPdfVO>());
+ printReport.put(tjOrderRemark,null);
}
-
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
-
- TjPdfVO tjPdfVO = new TjPdfVO();
- tjPdfVO.setProName(tjOrderDetail.getProName());
- tjPdfVO.setProResult(tjOrderDetail.getProResult());
- tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
- tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
- tjPdfVOS.add(tjPdfVO);
-
+ if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
+ TjPdfVO tjPdfVO = new TjPdfVO();
+ tjPdfVO.setProName(tjOrderDetail.getProName());
+ tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
+ tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
+ tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
+ tjPdfVOS.add(tjPdfVO);
+ }
}
printReport.put(entry.getKey(), tjPdfVOS);
}
@@ -818,9 +818,7 @@
if (null == tjOrderDetail.getProject()) {
System.out.println("'''''''''''''''''''''''''''''''''''" + tjOrderDetail.getOrderDetailId());
}
-
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
-
LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
List<TjStandard> list2 = tjStandardService.list(wq6);
--
Gitblit v1.8.0