From 4278843c6101eefe86f03ba516d72febd3218c8c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 二月 2025 16:27:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 6 ++++--
1 files changed, 4 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 40a052f..ce874a1 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) {
@@ -263,7 +265,7 @@
return R.ok();
}
MwTransitCar byId = carService.getById(one.getCarId());
- SysUser one1 = userService.lambdaQuery().eq(SysUser::getCarId, byId.getId()).one();
+ SysUser one1 = userService.lambdaQuery().eq(SysUser::getCarId, byId.getId()).last("limit 1").one();
CarDto carDto = new CarDto();
carDto.setLicensePlateNumber(byId.getLicensePlateNumber());
carDto.setUserName(one1.getUserName());
--
Gitblit v1.7.1