diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java index e88f49c..5dd2794 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookRecipe.java @@ -39,11 +39,17 @@ public class CookRecipe extends BaseEntity { @ApiModelProperty(value = "档口id") private Long stallId; + private String stallName; + /** 食堂id */ @Excel(name = "食堂id") @ApiModelProperty(value = "食堂id") private Long canteenId; + private String canteenName; + + private String areaName; + /** 菜品计划id(数据同步) */ @Excel(name = "菜品计划id(数据同步)") @ApiModelProperty(value = "菜品计划id(数据同步)") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml index 15192d2..3d35990 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml @@ -8,7 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -19,32 +22,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select recipe_id, recipe_name, recipe_type, stall_id, canteen_id, plan_id, effect_date, - expire_date, create_by, create_time, update_by, update_time - from cook_recipe + select cr.recipe_id, cr.recipe_name, cr.recipe_type, cr.stall_id, cr.canteen_id, cr.plan_id, cr.effect_date, + cr.expire_date, cr.create_by, cr.create_time, cr.update_by, cr.update_time, + bs.stall_name, bc.canteen_name, ba.area_name + from cook_recipe cr + left join basic_stall bs on bs.stall_id = cr.stall_id + left join basic_canteen bc on bc.canteen_id = bs.canteen_id + left join basic_area ba on ba.area_id = bc.area_id