From a04d4cced11bec0b33fba6fbf835a5e11f988d6d Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期四, 13 二月 2025 16:28:19 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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..de64123 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
@@ -219,7 +219,9 @@
public R<List<HospitalCollectTotalUpDto>> tanscollecttotal2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
//先获取医院ids
- List<MwCollectRecord> list = collectRecordService.lambdaQuery().eq(date!=null,MwCollectRecord::getCheckoutTime,date).eq(MwCollectRecord::getCheckoutUserId, sysUser.getUserId()).groupBy(MwCollectRecord::getDepartmentId).list();
+ List<MwCollectRecord> list = collectRecordService.lambdaQuery().ge(MwCollectRecord::getCheckoutTime, date.atStartOfDay())
+ .le(MwCollectRecord::getCheckoutTime, date.atTime(23,59,59))
+ .eq(MwCollectRecord::getCheckoutUserId, sysUser.getUserId()).groupBy(MwCollectRecord::getDepartmentId).list();
//循环医院，然后放入
List<HospitalCollectTotalUpDto> list1 = new ArrayList<>();
for (MwCollectRecord mwCollectRecord : list) {
@@ -475,7 +477,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