From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
index 2f0930c..74acf1c 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
@@ -18,7 +18,7 @@
import com.ruoyi.system.api.model.LoginUserInfo;
import com.ruoyi.worker.entity.MasterWorker;
import com.ruoyi.worker.entity.RecoveryServe;
-import com.ruoyi.worker.entity.ServeCoordinate;
+import com.ruoyi.worker.vo.ServeCoordinate;
import com.ruoyi.worker.service.MasterWorkerService;
import com.ruoyi.worker.service.RecoveryServeService;
import io.swagger.annotations.Api;
@@ -92,11 +92,12 @@
List<Integer> ids = orderList.stream().map(Order::getServeId).collect(Collectors.toList());
if (!ids.isEmpty()) {
List<RecoveryServe> serveList = recoveryServeService.lambdaQuery()
- .in(RecoveryServe::getId, ids).eq(RecoveryServe::getIsDelete, 0).list();
+ .in(RecoveryServe::getId, ids).list();
Map<Integer, String> map = serveList.stream().collect(Collectors.toMap(RecoveryServe::getId,
mw -> Optional.ofNullable(mw.getCover()).orElse("")));
for (Order order : orderList) {
order.setCover(map.get(order.getServeId()));
+ order.setReservationAddress(order.getReservationAddress() + order.getAddress());
}
}
return R.ok(dataList);
--
Gitblit v1.7.1