diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishestype/vo/DishesTypePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishestype/vo/DishesTypePageReqVO.java index 5e3dd0b1..bebed551 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishestype/vo/DishesTypePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishestype/vo/DishesTypePageReqVO.java @@ -23,6 +23,6 @@ public class DishesTypePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - private List ids; + private List ids; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesService.java index 02b7c343..276d6e4a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesService.java @@ -69,4 +69,5 @@ public interface DishesService { List getTodayDishes(); + List getTodayDishesNew(); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java index d45bbc8d..13427578 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java @@ -283,6 +283,21 @@ public class DishesServiceImpl implements DishesService { throw exception(2000_10_001, "无法获取设备编码"); } } + @Override + public List getTodayDishesNew() { + LocalDateTime today = LocalDateTime.now(); + String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE); + ArrayList week = new ArrayList<>(); + week.add(dayOfWeekInChinese); + week.add("整周"); + +// Long carteenId = deviceInfoService.getCarteen(getHearder()); + List dishesDOS = dishesMapper.selectList(Wrappers.lambdaQuery() +// .eq(DishesDO::getCarteenId, carteenId) + .in(DishesDO::getWeekTime, week) + .orderByDesc(DishesDO::getCreateTime)); + return dishesDOS; + } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java index b809a502..d08f9f5b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java @@ -90,9 +90,9 @@ public class DishesTypeServiceImpl implements DishesTypeService { @Override public PageResult getDishesTypePageApp(DishesTypePageReqVO pageReqVO) { - List todayDishes = dishesService.getTodayDishes(); + List todayDishes = dishesService.getTodayDishesNew(); if(CollectionUtil.isNotEmpty(todayDishes)){ - List ids = todayDishes.stream().map(DishesDO::getDishecType).collect(Collectors.toList()); + List ids = todayDishes.stream().map(vo -> Long.valueOf(vo.getDishecType())).collect(Collectors.toList()); pageReqVO.setIds(ids); } return dishesTypeMapper.selectPage(pageReqVO);