From 1631a9cd06a9272dbc808551ce7f0682cde2ba71 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期五, 21 三月 2025 17:01:07 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
index 3471155..6ace270 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
@@ -64,17 +64,17 @@
@ApiOperation(value = "接收统计上",tags = "处置人员")
@PostMapping("/out/total")
- public R<List<CollectTotalUpDto>> outtotal(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date1,@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
+ public R<List<CollectTotalUpDto>> outtotal(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- return R.ok(mwCheckoutRecordService.totalUp2(date1,date2,sysUser.getUserId()));
+ return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getUserId()));
}
@ApiOperation(value = "接收统计下",tags = "处置人员")
@PostMapping("/out/record")
- public R<List<CheckOutDto>> record1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date1,@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
+ public R<List<CheckOutDto>> record1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
SysUser sysUser1 = SecurityUtils.getLoginUser().getUser();
SysUser sysUser = userService.getById(sysUser1.getUserId());
LocalDate now = LocalDate.now();
- List<MwDisposalRecord> list = disposalRecordService.lambdaQuery().ge(date1!=null,MwDisposalRecord::getReceiveTime, date1.atStartOfDay()).le(date2!=null,MwDisposalRecord::getReceiveTime,date2.atTime(23,59,59)).eq(MwDisposalRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwDisposalRecord::getReceiveTime).list();
+ List<MwDisposalRecord> list = disposalRecordService.lambdaQuery().ge(date!=null,MwDisposalRecord::getReceiveTime, date.atStartOfDay()).le(date!=null,MwDisposalRecord::getReceiveTime,date.atTime(23,59,59)).eq(MwDisposalRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwDisposalRecord::getReceiveTime).list();
List<CheckOutDto> backList = new ArrayList<>();
for (MwDisposalRecord mwCheckoutRecord : list) {
CheckOutDto checkOutDto = new CheckOutDto();
@@ -92,17 +92,17 @@
@ApiOperation(value = "处置统计上",tags = "处置人员")
@PostMapping("/end/total")
- public R<List<CollectTotalUpDto>> outtotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date1, @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
+ public R<List<CollectTotalUpDto>> outtotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- return R.ok(mwCheckoutRecordService.totalUp2(date1,date2,sysUser.getUserId()));
+ return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getUserId()));
}
@ApiOperation(value = "处置统下",tags = "处置人员")
@PostMapping("/end/record")
- public R<List<CheckOutDto>> record2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date1,@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
+ public R<List<CheckOutDto>> record2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
LocalDate now = LocalDate.now();
- List<MwDisposalHandleRecord> list = handleRecordService.lambdaQuery().ge(date1!=null,MwDisposalHandleRecord::getDisposalTime, date1.atStartOfDay()).le(date2!=null,MwDisposalHandleRecord::getDisposalTime,date2.atTime(23,59,59)).eq(MwDisposalHandleRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwDisposalHandleRecord::getDisposalTime).list();
+ List<MwDisposalHandleRecord> list = handleRecordService.lambdaQuery().ge(date!=null,MwDisposalHandleRecord::getDisposalTime, date.atStartOfDay()).le(date!=null,MwDisposalHandleRecord::getDisposalTime,date.atTime(23,59,59)).eq(MwDisposalHandleRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwDisposalHandleRecord::getDisposalTime).list();
List<CheckOutDto> backList = new ArrayList<>();
for (MwDisposalHandleRecord mwCheckoutRecord : list) {
CheckOutDto checkOutDto = new CheckOutDto();
--
Gitblit v1.7.1