From d89a42213b4a32535e93185dedf41fe7a7fc1940 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 01:57:13 +0800
Subject: [PATCH] bug修改
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java | 19 +++++++++++--------
1 files changed, 11 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 d50a0f8..5413ab4 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
@@ -66,16 +66,18 @@
@ApiOperation(value = "接收统计上",tags = "处置人员")
@PostMapping("/out/total")
public R<List<CollectTotalUpDto>> outtotal(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getUserId()));
+// SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ SysDepartment myDepartment = departmentService.getMyDepartment();
+ return R.ok(mwCheckoutRecordService.totalUp2(date,myDepartment.getId()));
}
@ApiOperation(value = "接收统计下",tags = "处置人员")
@PostMapping("/out/record")
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(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();
+// SysUser sysUser1 = SecurityUtils.getLoginUser().getUser();
+// SysUser sysUser = userService.getById(sysUser1.getUserId());
+// LocalDate now = LocalDate.now();
+ SysDepartment myDepartment = departmentService.getMyDepartment();
+ 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, myDepartment.getId()).orderByDesc(MwDisposalRecord::getReceiveTime).list();
List<CheckOutDto> backList = new ArrayList<>();
for (MwDisposalRecord mwCheckoutRecord : list) {
CheckOutDto checkOutDto = new CheckOutDto();
@@ -94,8 +96,9 @@
@ApiOperation(value = "处置统计上",tags = "处置人员")
@PostMapping("/end/total")
public R<List<CollectTotalUpDto>> outtotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getDepartmentId()));
+ SysDepartment myDepartment = departmentService.getMyDepartment();
+ List<CollectTotalUpDto> collectTotalUpDtos = mwCheckoutRecordService.totalUp2(date, myDepartment.getId());
+ return R.ok(collectTotalUpDtos);
}
@ApiOperation(value = "处置统下",tags = "处置人员")
--
Gitblit v1.7.1