From 14352a6d7b916862537c29c84a6db777db9fcbef Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 14 Sep 2024 16:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=98=9F=E6=A1=8C=E5=9E=8B=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/app/TbCallServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java index b76b9f7a..d5f56507 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java @@ -307,11 +307,14 @@ public class TbCallServiceImpl implements TbCallService { Page pageInfo = callTableService.page(new Page<>(page, size), query); ArrayList> info = new ArrayList<>(); pageInfo.getRecords().forEach(item -> { - Long count = callQueueService.lambdaQuery() - .eq(TbCallQueue::getCallTableId, item.getId()) + LambdaQueryChainWrapper q = callQueueService.lambdaQuery() .eq(TbCallQueue::getCreateDay, DateUtil.today()) - .in(TbCallQueue::getState, 0, 1) - .count(); + .in(TbCallQueue::getState, 0, 1); + if (state == null) { + q.eq(TbCallQueue::getCallTableId, item.getId()); + + } + Long count = q.count(); Map map = BeanUtil.beanToMap(item, false, false); map.put("totalCount", count);