From da392a50b1ea129d1626c1936f0b5ed5ed457b30 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 17:14:50 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java | 5 +++--
1 files changed, 3 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 5794268..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;
@@ -57,9 +58,9 @@
List<TOrderMeal> orderMeals = orderMealService.list(Wrappers.lambdaQuery(TOrderMeal.class)
.in(TOrderMeal::getBoardId, ids)
.isNotNull(TOrderMeal::getMealTime)
- .orderByDesc(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());
--
Gitblit v1.7.1