From 38057e96a0e8bd9647a778873424db2750009d49 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 20 Jun 2025 10:02:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=8E=A8=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/kitchen/domain/KitchenWasteDeal.java | 16 +++++++++++++++- .../core/kitchen/domain/KitchenWasteMeal.java | 7 ++++++- .../impl/KitchenWasteDealServiceImpl.java | 11 ++++++++++- .../mapper/kitchen/KitchenWasteDealMapper.xml | 5 ++++- .../mapper/kitchen/KitchenWasteMealMapper.xml | 5 +++-- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java index afbf43d..46bd8a9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java @@ -65,7 +65,11 @@ public class KitchenWasteDeal extends BaseEntity { /** 处理方式: 1-丢弃,2-下一餐使用,3-集中售卖 */ @Excel(name = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖") @ApiModelProperty(value = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖") - private Long dealType; + private Integer dealType; + + @Excel(name = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖") + @ApiModelProperty(value = "处理方式: 1-丢弃,2-下一餐使用,3-集中售卖") + private String dealTypeName; /** 售卖金额 */ @Excel(name = "售卖金额") @@ -82,6 +86,16 @@ public class KitchenWasteDeal extends BaseEntity { @ApiModelProperty(value = "处理人id") private Long staffId; + /** 现场照片 */ + @Excel(name = "食堂名称") + @ApiModelProperty(value = "食堂名称") + private String canteenName; + + /** 现场照片 */ + @Excel(name = "处理人姓名") + @ApiModelProperty(value = "处理人姓名") + private String dealUserName; + @ApiModelProperty("开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java index 0f4b94c..bb87e3d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java @@ -27,9 +27,14 @@ public class KitchenWasteMeal extends BaseEntity { /** 台账日期时间 */ @ApiModelProperty(value = "台账日期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "台账日期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime ledgerTime; + + @ApiModelProperty(value = "台账日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "台账日期时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date ledgerTime; + private LocalDateTime ledgerDate; /** 餐次 */ @Excel(name = "餐次") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java index a550001..43fec3d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java @@ -1,6 +1,9 @@ package com.bonus.canteen.core.kitchen.service.impl; import java.util.List; + +import cn.hutool.core.collection.CollUtil; +import com.bonus.canteen.core.kitchen.domain.constants.WasteDealTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +42,13 @@ public class KitchenWasteDealServiceImpl implements IKitchenWasteDealService { */ @Override public List selectKitchenWasteDealList(KitchenWasteDeal kitchenWasteDeal) { - return kitchenWasteDealMapper.selectKitchenWasteDealList(kitchenWasteDeal); + List list = kitchenWasteDealMapper.selectKitchenWasteDealList(kitchenWasteDeal); + if(CollUtil.isNotEmpty(list)) { + for(KitchenWasteDeal wasteDeal : list) { + wasteDeal.setDealTypeName(WasteDealTypeEnum.getDescByKey(wasteDeal.getDealType())); + } + } + return list; } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml index 88ffc8b..29f8ab8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml @@ -20,12 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select waste_id, weight, garbage_name, action_date, device_id, mealtime_type, kwd.canteen_id, kwd.area_id, deal_type, sale_amount, scene_picture, kwd.staff_id, - kwd.create_by, kwd.create_time, kwd.update_by, kwd.update_time + kwd.create_by, kwd.create_time, kwd.update_by, kwd.update_time, bc.canteen_name, + su.user_name as deal_user_name from kitchen_waste_deal kwd left join basic_canteen bc on kwd.canteen_id = bc.canteen_id left join kitchen_staff_info ksi on kwd.staff_id = ksi.staff_id diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml index 181984e..da1db45 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml @@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -105,10 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file