From 0bd6ed40a23eece048c3446f361b12c7f6514850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 11 Dec 2024 14:02:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20callRecord=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/entity/vo/CallRecordVO.java | 2 +- .../system/cashierservice/mapper/TbCallQueueMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallRecordVO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallRecordVO.java index 3a071bc..bcadd61 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallRecordVO.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CallRecordVO.java @@ -7,6 +7,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data public class CallRecordVO extends TbCallQueue { - private String note; + private String tableNote; private Long sinceAt; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java index 29e7cfe..9a2d2ff 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/mapper/TbCallQueueMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select; */ public interface TbCallQueueMapper extends BaseMapper { - @Select("select a.*, b.note, TIMESTAMPDIFF(SECOND, a.create_time, NOW()) as since_at from tb_call_queue a " + + @Select("select a.*, b.note as tableNote, TIMESTAMPDIFF(SECOND, a.create_time, NOW()) as since_at from tb_call_queue a " + "left join tb_call_table b on a.call_table_id=b.id " + "where a.shop_id=#{shopId} and a.state in (3, 2, 1) order by a.create_time desc") Page selectCallRecord(Integer shopId, Integer callTableId, Page objectPage);