From 83d8172aaf19a42b13cac61404b3b9c1f0ea61de Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 12 二月 2025 15:35:34 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 6a21a0b..0d6407e 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
@@ -435,7 +435,6 @@
//通过车辆id查询列表
List<CollectCarTotalUpDto> list = collectRecordService.carGroup(byId.getCarId(),name);
return R.ok(list);
-
}
@ApiOperation(value = "已装车列表详情",tags = "运输人员")
@@ -466,6 +465,9 @@
public R<List<CollectTotalUpDto>> collecttotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
SysUser byId = userService.getById(sysUser.getUserId());
+ if (date==null){
+ date = LocalDate.now();
+ }
return R.ok(collectRecordService.collectTotal(date,byId.getDepartmentId()));
}
@ApiOperation("收集统计下")
@@ -473,8 +475,11 @@
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()
+ .eq(MwCollectRecord::getCollectTime, DateUtils.toDate(date))
+ .eq(MwCollectRecord::getDepartmentId, byId.getDepartmentId())
+ .orderByDesc(MwCollectRecord::getCollectTime)
+ .page(Page.of(pageNum, pageSize));
return R.ok(page);
}
--
Gitblit v1.7.1