大屏统计修改

mitao

2025-04-14 0852acae13603be95eaaa0b501f3441508ff3fe5

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwBoxServiceImpl.java

@@ -48,9 +48,9 @@
            boxStatisticsVO.setTotal(boxList.size());
            boxStatisticsVO.setBrokenCount(boxList.stream().filter(box -> BoxStatusEnum.BROKEN.getCode().equals(box.getStatus())).count());
            boxStatisticsVO.setLostCount(boxList.stream().filter(box -> BoxStatusEnum.LOST.getCode().equals(box.getStatus())).count());
            boxStatisticsVO.setDisposeCount(boxList.stream().filter(box -> BoxProcessEnum.DISPOSAL.getCode().equals(box.getStatus())).count());
            boxStatisticsVO.setHospitalUsingCount(boxList.stream().filter(box -> BoxProcessEnum.HOSPITAL_USING.getCode().equals(box.getStatus())).count());
            boxStatisticsVO.setTransitingCount(boxList.stream().filter(box -> BoxProcessEnum.TRANSITING.getCode().equals(box.getStatus())).count());
            boxStatisticsVO.setDisposeCount(boxList.stream().filter(box -> BoxProcessEnum.DISPOSAL.getCode().equals(box.getLink())).count());
            boxStatisticsVO.setHospitalUsingCount(boxList.stream().filter(box -> BoxProcessEnum.HOSPITAL_USING.getCode().equals(box.getLink())).count());
            boxStatisticsVO.setTransitingCount(boxList.stream().filter(box -> BoxProcessEnum.TRANSITING.getCode().equals(box.getLink())).count());
        }
        return boxStatisticsVO;
    }
@@ -72,7 +72,7 @@
                .between(Objects.nonNull(query.getLastUseTimeStart())
                                && Objects.nonNull(query.getLastUseTimeEnd()),
                        MwBox::getLastUseTime, query.getLastUseTimeStart(), query.getLastUseTimeEnd())
                .orderByDesc(MwBox::getBoxNumber)
                .orderByDesc(MwBox::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        return PageDTO.of(page, MwBoxVO.class);
    }