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 { - @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 selectCallRecord(Integer shopId, Integer callTableId, Page 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; }