From 39f646310da30140a11b13e514a0e22c589483a8 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 1 Jul 2025 17:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E6=A1=A3?= =?UTF-8?q?=E5=8F=A3=E9=A4=90=E6=AC=A1=E7=9A=84=E6=89=80=E6=9C=89=E8=8F=9C?= =?UTF-8?q?=E5=93=81=E5=8F=8A=E5=85=B6=E7=95=99=E6=A0=B7=E7=89=B9=E5=BE=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KitchenSampleDishesRecordController.java | 11 +++++ .../domain/KitchenSampleDishesRecord.java | 16 +++++++ .../KitchenSampleDishesRecordMapper.java | 2 + .../IKitchenSampleDishesRecordService.java | 2 + .../KitchenSampleDishesRecordServiceImpl.java | 18 +++++++ .../KitchenSampleDishesRecordMapper.xml | 47 +++++++++++++++++++ 6 files changed, 96 insertions(+) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java index b2701cb..0a62cc9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSampleDishesRecordController.java @@ -55,6 +55,17 @@ public class KitchenSampleDishesRecordController extends BaseController { return getDataTable(list); } + /** + * 查询当前档口餐次的所有菜品及其留样特征 + */ + @ApiOperation(value = "查询当前档口餐次的所有菜品及其留样特征") + //@RequiresPermissions("kitchen:record:list") + @PostMapping("/listDishes") + public TableDataInfo listDishes(@RequestBody @Valid KitchenSampleDishesRecord kitchenSampleDishesRecord) { + List list = kitchenSampleDishesRecordService.getDishesByStallAndMealtimeType(kitchenSampleDishesRecord); + return getDataTable(list); + } + /** * 导出留样机留样清单列表 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java index 5dbfe61..21cecee 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleDishesRecord.java @@ -1,8 +1,11 @@ package com.bonus.canteen.core.kitchen.domain; import java.io.Serializable; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; + +import com.bonus.canteen.core.common.utils.FileUrlUtil; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -176,6 +179,9 @@ public class KitchenSampleDishesRecord extends BaseEntity { @ApiModelProperty("菜品名称") private String dishesName; + @ApiModelProperty("菜品图片") + private String dishesImgUrl; + @ApiModelProperty("设备名称") private String deviceName; @@ -183,4 +189,14 @@ public class KitchenSampleDishesRecord extends BaseEntity { private String staffName; private String searchValue; + + private LocalDate applyDate; + + public String getImageUrl() { + return FileUrlUtil.getFileUrl(this.imageUrl); + } + + public String getDishesImgUrl() { + return FileUrlUtil.getFileUrl(this.dishesImgUrl); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java index 3cd8084..276cfdb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenSampleDishesRecordMapper.java @@ -64,4 +64,6 @@ public interface KitchenSampleDishesRecordMapper { * @return 结果 */ public int handleKitchenSampleDishesTimeOut(); + + public List getDishesByStallAndMealtimeType(KitchenSampleDishesRecord kitchenSampleDishesRecord); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java index a8285d7..5c61237 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenSampleDishesRecordService.java @@ -64,4 +64,6 @@ public interface IKitchenSampleDishesRecordService { * @return 结果 */ public int handleKitchenSampleDishesTimeOut(); + + public List getDishesByStallAndMealtimeType(KitchenSampleDishesRecord kitchenSampleDishesRecord); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java index 7471670..d4caf8c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.kitchen.service.impl; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -145,4 +146,21 @@ public class KitchenSampleDishesRecordServiceImpl implements IKitchenSampleDishe public int handleKitchenSampleDishesTimeOut() { return kitchenSampleDishesRecordMapper.handleKitchenSampleDishesTimeOut(); } + + public List getDishesByStallAndMealtimeType(KitchenSampleDishesRecord kitchenSampleDishesRecord) { + kitchenSampleDishesRecord.setApplyDate(LocalDate.now()); + List fullDishes = kitchenSampleDishesRecordMapper.getDishesByStallAndMealtimeType(kitchenSampleDishesRecord); + List sampleDishes = new ArrayList<>(); + if(kitchenSampleDishesRecord.getSearchType().equals(SampleDishesSearchType.TODAY.getKey())) { + kitchenSampleDishesRecord.setStartDateTime(LocalDateTime.of(LocalDate.now(),LocalTime.MIDNIGHT)); + kitchenSampleDishesRecord.setEndDateTime(LocalDateTime.of(LocalDate.now(),LocalTime.MAX)); + sampleDishes = kitchenSampleDishesRecordMapper.selectKitchenSampleDishesRecordList(kitchenSampleDishesRecord); + } + for (KitchenSampleDishesRecord fullRecord : fullDishes) { + for (KitchenSampleDishesRecord sampleRecord : sampleDishes) { + fullRecord.setSampleSaveTime(sampleRecord.getSampleSaveTime()); + } + } + return fullDishes; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml index b149d62..6e1c0ae 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml @@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -219,4 +220,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enter_cabinet_time NOW() - INTERVAL 48 HOUR and enter_cabinet_time ]]> NOW() - INTERVAL 72 HOUR + + \ No newline at end of file