diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java index 964f2a6..5a2d7df 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java @@ -60,6 +60,9 @@ public class CookEvaluaOrder extends BaseEntity { @ApiModelProperty(value = "档口或店铺id") private Long stallId; + @ApiModelProperty(value = "档口名称") + private String stallName; + /** 展示状态(1-展示,2-不展示) */ @Excel(name = "展示状态(1-展示,2-不展示)") @ApiModelProperty(value = "展示状态(1-展示,2-不展示)") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml index 439684b..87a10b3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,34 +22,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select evalua_id, user_id, order_id, star_level, description, reply, reply_time, stall_id, - show_flag, order_evalua_type, create_by, create_time, update_by, update_time - from cook_evalua_order + select ceo.evalua_id, ceo.user_id, ceo.order_id, ceo.star_level, ceo.description, ceo.reply, ceo.reply_time, + ceo.stall_id, ceo.show_flag, ceo.order_evalua_type, ceo.create_by, ceo.create_time, ceo.update_by, + ceo.update_time, bs.stall_name + from cook_evalua_order ceo + left join basic_stall bs on bs.stall_id = ceo.stall_id