From 61313c5dc05cf7d8be02d3e7cc8a3c89d1774b06 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 12 二月 2025 15:37:39 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 7 ++++++-
1 files changed, 6 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 6e4a5db..40a052f 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
@@ -475,7 +475,12 @@
public R<Page<MwCollectRecord>> collecttotal2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date,@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
SysUser byId = userService.getById(sysUser.getUserId());
- Page<MwCollectRecord> page = collectRecordService.lambdaQuery().eq(date!=null,MwCollectRecord::getCollectTime,date).eq(MwCollectRecord::getDepartmentId, byId.getDepartmentId()).orderByDesc(MwCollectRecord::getCollectTime).page(Page.of(pageNum, pageSize));
+ Page<MwCollectRecord> page = collectRecordService.lambdaQuery()
+ .ge(MwCollectRecord::getCreateTime, date.atStartOfDay())
+ .le(MwCollectRecord::getCreateTime, date.atTime(23,59,59))
+ .eq(MwCollectRecord::getDepartmentId, byId.getDepartmentId())
+ .orderByDesc(MwCollectRecord::getCollectTime)
+ .page(Page.of(pageNum, pageSize));
return R.ok(page);
}
--
Gitblit v1.7.1