From 2d98f8b5b6f72e4b274fd292c21e5bd49980a8c8 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期一, 07 四月 2025 09:46:17 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 14 +++++++++++---
1 files changed, 11 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 073d528..d3854a5 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
@@ -243,10 +243,10 @@
@ApiOperation(value = "运输统计上(医院数量)",tags = "运输人员")
@PostMapping("/trans/collect/hospital/count")
- public R<Long> tanscollecttotal12(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
+ public R<Integer> tanscollecttotal12(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- 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);
+ List<MwCollectRecord> list = 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).list();
+ return R.ok(list.size());
}
@ApiOperation(value = "运输统计下",tags = "运输人员")
@@ -500,6 +500,14 @@
return R.ok(list);
}
+ @ApiOperation("库存详情")
+ @PostMapping("/record1")
+ public R<List<MwCollectRecord>> record1(@RequestParam String boxNumber) {
+ List<MwCollectRecord> list = collectRecordService.lambdaQuery().isNull(MwCollectRecord::getCheckoutTime).eq(MwCollectRecord::getStatus ,1).eq(MwCollectRecord::getBoxNumber, boxNumber).orderByDesc(MwCollectRecord::getCollectTime).list();
+ return R.ok(list);
+ }
+
+
@ApiOperation("收集统计上")
@PostMapping("/collect/total")
public R<List<CollectTotalUpDto>> collecttotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
--
Gitblit v1.7.1