From 26c801991efedbd692ace4add657823594ff5455 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 23 七月 2024 18:02:40 +0800
Subject: [PATCH] zjh 2024/07/23-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 31 +++----------------------------
1 files changed, 3 insertions(+), 28 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 e95577f..5a847c7 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
@@ -96,7 +96,6 @@
private ISysDictDataService dictDataService;
@Resource
private ITbTransitionService transitionService;
-
@Autowired
private ITjBigPositiveService tjBigPositiveService;
@Autowired
@@ -420,8 +419,7 @@
return AjaxResult.error();
}
- @Autowired
- private TjReportController tjReportController;
+
/**
* 鎾ら攢
@@ -1466,34 +1464,11 @@
//鍒涘缓map 閿负鐖堕」鐩� 鍊间负瀛愰」鐩泦鍚�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new LinkedHashMap<>();
//鏌ュ埌璇ュ鎴风殑浣撴璁板綍
-// LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
-// wq1.eq(TjOrder::getTjNumber, tjNumber);
-// TjOrder one = tjOrderService.getOne(wq1);
//鎷垮埌浣撴璁板綍鐨刼rderid锛屾煡鍑洪」鐩缁嗕俊鎭�
-// LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
-// //20230323鍒ゆ柇椤圭洰宸叉
-// wq.ne(TjOrderDetail::getTjStatus, 0);
-// wq.eq(TjOrderDetail::getProId,projectService.getHuaYanProId());
-// List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
- List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanAndCgTable(tjNumber);
- //閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
- //閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
-// for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
-// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
-// if (null != tjProject) {
-// tjOrderDetail.setProject(tjProject);
-// }
-// }
-// LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
-// wq22.eq(TjCustomer::getCusId, one.getUserId());
-// TjCustomer customer = tjCustomerService.getOne(wq22);
-// LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
-// wqq.eq(TjOrderRemark::getDeptId,"241");
-// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+ List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanAndCgTable(tjNumber);
+
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanAndCgTable(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
--
Gitblit v1.8.0