diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java index c2973fa..a5fd6d8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteenSuggestion.java @@ -40,6 +40,9 @@ public class AllocCanteenSuggestion extends BaseEntity { @ApiModelProperty(value = "餐厅id") private Long canteenId; + @ApiModelProperty(value = "餐厅名称") + private String canteenName; + /** 投诉图片 */ @Excel(name = "投诉图片") @ApiModelProperty(value = "投诉图片") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml index bd9601c..bc91906 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocCanteenSuggestionMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,30 +22,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select complaint_id, user_id, content, canteen_id, complaint_picture, source_type, mobile, - reply_content, revision, reply_state, create_by, create_time, update_by, update_time - from alloc_canteen_suggestion + select acs.complaint_id, acs.user_id, acs.content, acs.canteen_id, acs.complaint_picture, acs.source_type, + acs.mobile, acs.reply_content, acs.revision, acs.reply_state, acs.create_by, acs.create_time, + acs.update_by, acs.update_time, ac.canteen_name + from alloc_canteen_suggestion acs + left join alloc_canteen ac on acs.canteen_id = ac.canteen_id