From 9ca97fd558700e7054c5f54192a9db7a1e6b8230 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 16:31:47 +0800
Subject: [PATCH] 完善导出等接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
index 9d1e7f4..460a18c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
@@ -15,6 +15,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -55,13 +56,16 @@
List<Long> ids = list.stream().filter(e -> !e.getStatus().equals(1)).map(TBoard::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(ids)){
List<TOrderMeal> orderMeals = orderMealService.list(Wrappers.lambdaQuery(TOrderMeal.class)
- .in(TOrderMeal::getBoardId, ids));
+ .in(TOrderMeal::getBoardId, ids)
+ .isNotNull(TOrderMeal::getMealTime)
+ .orderByDesc(TOrderMeal::getCreateTime));
for (TBoard board : list) {
- List<TOrderMeal> collect = orderMeals.stream().filter(e -> board.getId().equals(e.getBoardId())).collect(Collectors.toList());
+ List<TOrderMeal> collect = orderMeals.stream().filter(e -> board.getId().equals(e.getBoardId())).sorted(Comparator.comparing(TOrderMeal::getCreateTime).reversed()).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(collect)){
board.setMealType(collect.get(0).getMealType());
board.setMealPerson(collect.get(0).getMealPerson());
board.setOrderMoney(collect.get(0).getOrderMoney());
+ board.setOrderMealId(collect.get(0).getId());
}
}
}
--
Gitblit v1.7.1