From 6aaa47ce1028db3f3275eaf37beef4700971cfd6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 16 十月 2024 13:56:17 +0800
Subject: [PATCH] zjh20241016
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 039a8b7..fbde798 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -403,11 +403,12 @@
chargingStandardService.save(tjChargingStandard);
}
- LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
- wq.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq.eq(TjOrderDetail::getIsSampling, 0);
- List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
+// LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
+// wq.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wq.eq(TjOrderDetail::getIsSampling, 0);
+// List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser);
}
@@ -1003,6 +1004,7 @@
tree.setType("妫�楠�");
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ wrapper.eq(TjProject::getProParentId,0);
List<TjProject> list = projectService.list(wrapper);
String tj_price = "";
for (TjProject project : list) {
@@ -1065,6 +1067,7 @@
tree.setType("妫�鏌�");
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ wrapper.eq(TjProject::getProParentId,0);
List<TjProject> list = projectService.list(wrapper);
String tj_price = "";
for (TjProject project : list) {
@@ -1175,6 +1178,7 @@
tree.setType("澶勭疆");
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ wrapper.eq(TjProject::getProParentId,0);
List<TjProject> list = projectService.list(wrapper);
String tj_price = "";
for (TjProject project : list) {
--
Gitblit v1.8.0