From 5351be915c90532124c2194cec75c3d0ffa99b6c Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 14 Sep 2024 16:57:32 +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=E6=B7=BB=E5=8A=A0=E6=80=BB=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/app/TbCallServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 c1806d66..560f918d 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,23 +307,23 @@ public class TbCallServiceImpl implements TbCallService { } Page pageInfo = callTableService.page(new Page<>(page, size), query); ArrayList> info = new ArrayList<>(); - pageInfo.getRecords().forEach(item -> { + Long totalCount = 0L; + for (TbCallTable item : pageInfo.getRecords()) { LambdaQueryChainWrapper q = callQueueService.lambdaQuery() .eq(TbCallQueue::getCreateDay, DateUtil.today()) .in(TbCallQueue::getState, 0, 1); - if (state == null) { - q.eq(TbCallQueue::getCallTableId, item.getId()); - - } Long count = q.count(); + totalCount += count; + Map map = BeanUtil.beanToMap(item, false, false); map.put("totalCount", count); info.add(map); - }); + } Map toMap = BeanUtil.beanToMap(pageInfo); toMap.put("records", info); + toMap.put("totalCount", totalCount); return toMap; }