From 4ac8211277d589c9ce6648a43ed6aec3d17dcbc0 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Wed, 5 Mar 2025 14:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=8F=9C=E8=B0=B1=E8=AE=A1=E5=88=92=E8=8F=9C=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/mapper/MenuRecipeDetailMapper.java | 2 ++ .../service/impl/MenuRecipeServiceImpl.java | 4 ++- .../mapper/menu/MenuRecipeDetailMapper.xml | 35 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java index 6b6d145b..46f974a2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeDetailMapper.java @@ -32,4 +32,6 @@ public interface MenuRecipeDetailMapper extends BaseMapper { List selectIssueRecipeV2Compress(@Param("issueRecipeV2DTO") IssueRecipeV2DTO issueRecipeV2DTO); + List selectDateDetailList(@Param("recipeId") Long recipeId, @Param("applyDate") LocalDate applyDate); + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java index 71a8a2c1..ea6e90c4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -1177,7 +1177,9 @@ public class MenuRecipeServiceImpl extends ServiceImpl getMenuRecipeDateDetail(MenuRecipeDetailDateDTO content) { - return Collections.emptyList(); + this.generateRecipe(content.getRecipeId(), content.getApplyDate()); + List menuRecipeDetailDateVOS = this.menuRecipeDetailMapper.selectDateDetailList(content.getRecipeId(), content.getApplyDate()); + return menuRecipeDetailDateVOS.stream().sorted(Comparator.comparing(MenuRecipeDetailDateVO::getMealtimeType)).collect(Collectors.toList()); } @Override diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml index 57ff2027..1045c01b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeDetailMapper.xml @@ -220,4 +220,39 @@ order by mrdd.sort_num asc + + +