From 90fa10399f4dfcb366bdd05a9f2a23cb9a4e6044 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 25 三月 2025 18:15:17 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN --- medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java index 17fa22a..073d528 100644 --- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java +++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java @@ -245,7 +245,7 @@ @PostMapping("/trans/collect/hospital/count") public R<Long> tanscollecttotal12(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) { SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long count = collectRecordService.lambdaQuery().eq(date!=null,MwCollectRecord::getCheckoutTime,date).eq(MwCollectRecord::getCheckoutUserId, sysUser.getUserId()).groupBy(MwCollectRecord::getDepartmentId).count(); + Long count = collectRecordService.lambdaQuery().ge(date!=null,MwCollectRecord::getCheckoutTime, date.atStartOfDay()).le(date!=null,MwCollectRecord::getCheckoutTime , date.atTime(23,59,59)).eq(MwCollectRecord::getCheckoutUserId, sysUser.getUserId()).groupBy(MwCollectRecord::getDepartmentId).count(); return R.ok(count); } -- Gitblit v1.7.1