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; }