From b22f118eabab8f2f27dbd73e7c6cb1090cd82c82 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 14:46:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..d50a0f8 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 = "出库统计上")
@@ -100,16 +101,18 @@
@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