From 90e8e4944ea34a64bc93ddfa31146863dd4442d5 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 14 Sep 2024 15:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E8=AE=B0=E5=BD=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java   | 2 +-
 .../src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java
index f30242e5..77381657 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCallQueueMapper.java
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select;
 */
 public interface TbCallQueueMapper extends BaseMapper<TbCallQueue> {
 
-    @Select("select * from tb_call_queue a " +
+    @Select("select a.*, b.note, 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.call_table_id=#{callTableId}")
     Page<CallRecordVO> selectCallRecord(Integer shopId, Integer callTableId, Page<Object> objectPage);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java
index f408dd60..d25aef19 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/vo/CallRecordVO.java
@@ -11,4 +11,5 @@ import java.time.Instant;
 @Data
 public class CallRecordVO extends TbCallQueue {
     private String note;
+    private Long sinceAt;
 }