From 07ca0bf260cb8036b1505a7f3f0ec4f2a73ad064 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 26 十二月 2024 15:46:12 +0800
Subject: [PATCH] zjh202412026
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 7 +++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 4 ++++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index ecf1ca9..c2b1249 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -35,6 +35,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
@@ -1644,6 +1645,9 @@
} else {
tjOrderDetail.setDoctorName(null);
}
+ if(StringUtil.isBlank(tjOrderDetail.getProResult())){
+ tjOrderDetail.setProResult(project.getProDefault());
+ }
tjOrderDetailList.add(tjOrderDetail);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 4c02c33..d459020 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -609,14 +609,14 @@
.like(TjCustomer::getCusPhone, tjPhone);
List<TjCustomer> customerList = customerService.list(wq0);
if (null != customerList && !customerList.isEmpty()) {
- for (TjCustomer customer : customerList) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getUserId, customer.getCusId());
+ wq1.in(TjOrder::getUserId,customerList.stream().map(TjCustomer::getCusId).collect(Collectors.toList()));
wq1.eq(TjOrder::getCheckStatus, 0);
wq1.orderByDesc(TjOrder::getCreateTime);
List<TjOrder> tjOrders = orderService.list(wq1);
if (null != tjOrders && !tjOrders.isEmpty()) {
for (TjOrder order : tjOrders) {
+ TjCustomer customer = customerService.getById(order);
LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
List<TjOrderDetail> detailList = detailService.list(wq2);
@@ -646,11 +646,10 @@
tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
tjCollectFeesVoList.add(tjRefundVo);
}
- // tjRefundVo.setPaidIn(String.valueOf(one.getPaidIn()));
}
}
}
- }
+
return AjaxResult.success(tjCollectFeesVoList);
}
return AjaxResult.error("璇ョ敤鎴蜂笉瀛樺湪");
--
Gitblit v1.8.0