From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 ca4ec50..281d65f 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
@@ -52,6 +52,7 @@
private final MwTransitCarService carService;
private final MwDisposalRecordService disposalRecordService;
private final MwDisposalHandleRecordService handleRecordService;
+ private final SysDepartmentService departmentService;
@ApiOperation(value = "出库统计上")
@@ -93,23 +94,26 @@
@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 = "处置人员")
@PostMapping("/end/record")
public R<List<CheckOutDto>> record2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ SysDepartment myDepartment = departmentService.getMyDepartment();
LocalDate now = LocalDate.now();
- 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<MwDisposalHandleRecord> list = handleRecordService.lambdaQuery().ge(date!=null,MwDisposalHandleRecord::getDisposalTime, date.atStartOfDay()).le(date!=null,MwDisposalHandleRecord::getDisposalTime,date.atTime(23,59,59)).eq(MwDisposalHandleRecord::getDepartmentId, myDepartment.getId()).orderByDesc(MwDisposalHandleRecord::getDisposalTime).list();
List<CheckOutDto> backList = new ArrayList<>();
for (MwDisposalHandleRecord mwCheckoutRecord : list) {
CheckOutDto checkOutDto = new CheckOutDto();
SysUser byId = userService.getById(mwCheckoutRecord.getDriverId());
checkOutDto.setDriverName(byId.getNickName());
MwTransitCar byId1 = carService.getById(mwCheckoutRecord.getCarId());
- checkOutDto.setLicensePlateNumber(byId1.getLicensePlateNumber());
+ if (byId1!=null){
+ checkOutDto.setLicensePlateNumber(byId1.getLicensePlateNumber());
+ }
checkOutDto.setCheckoutTime(mwCheckoutRecord.getDisposalTime());
List<CollectTotalUpDto> records = mwCheckoutRecordService.totalUp1(mwCheckoutRecord.getId());
checkOutDto.setRecords(records);
--
Gitblit v1.7.1