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 | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 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 a108e43..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
@@ -7,10 +7,7 @@
import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.SecurityUtils;
-import com.sinata.system.domain.MwCheckoutRecord;
-import com.sinata.system.domain.MwDisposalHandleRecord;
-import com.sinata.system.domain.MwDisposalRecord;
-import com.sinata.system.domain.MwTransitCar;
+import com.sinata.system.domain.*;
import com.sinata.system.domain.dto.CheckOutDto;
import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.domain.query.CheckoutRecordQuery;
@@ -55,27 +52,30 @@
private final MwTransitCarService carService;
private final MwDisposalRecordService disposalRecordService;
private final MwDisposalHandleRecordService handleRecordService;
+ private final SysDepartmentService departmentService;
@ApiOperation(value = "出库统计上")
@PostMapping("/total")
public R<List<CollectTotalUpDto>> total(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- return R.ok(mwCheckoutRecordService.totalUp(date,sysUser.getDepartmentId()));
+ SysUser byId = userService.getById(sysUser.getUserId());
+ return R.ok(mwCheckoutRecordService.totalUp(date,byId.getDepartmentId()));
}
@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) {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ 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).le(date2!=null,MwDisposalRecord::getReceiveTime,date2).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();
@@ -84,7 +84,7 @@
MwTransitCar byId1 = carService.getById(mwCheckoutRecord.getCarId());
checkOutDto.setLicensePlateNumber(byId1.getLicensePlateNumber());
checkOutDto.setCheckoutTime(mwCheckoutRecord.getReceiveTime());
- List<CollectTotalUpDto> records = mwCheckoutRecordService.totalUp1(mwCheckoutRecord.getId());
+ List<CollectTotalUpDto> records = mwCheckoutRecordService.totalUp6(mwCheckoutRecord.getId());
checkOutDto.setRecords(records);
backList.add(checkOutDto);
}
@@ -93,24 +93,27 @@
@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) {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
- return R.ok(mwCheckoutRecordService.totalUp2(date1,date2,sysUser.getUserId()));
+ public R<List<CollectTotalUpDto>> outtotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
+ 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 date1,@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date2) {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ public R<List<CheckOutDto>> record2(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
+ SysDepartment myDepartment = departmentService.getMyDepartment();
LocalDate now = LocalDate.now();
- List<MwDisposalHandleRecord> list = handleRecordService.lambdaQuery().ge(date1!=null,MwDisposalHandleRecord::getDisposalTime, date1).le(date2!=null,MwDisposalHandleRecord::getDisposalTime,date2).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);
@@ -124,10 +127,12 @@
@ApiOperation(value = "出库统计下")
@PostMapping("/record")
- public R<List<CheckOutDto>> record() {
+ public R<List<CheckOutDto>> record(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ SysUser byId2 = userService.getById(sysUser.getUserId());
LocalDate now = LocalDate.now();
- List<MwCheckoutRecord> list = mwCheckoutRecordService.lambdaQuery().eq(MwCheckoutRecord::getCheckoutTime, now).eq(MwCheckoutRecord::getDepartmentId, sysUser.getDepartmentId()).orderByDesc(MwCheckoutRecord::getCheckoutTime).list();
+ List<MwCheckoutRecord> list = mwCheckoutRecordService.lambdaQuery().ge(MwCheckoutRecord::getCreateTime, date.atStartOfDay())
+ .le(MwCheckoutRecord::getCreateTime, date.atTime(23,59,59)).eq(MwCheckoutRecord::getDepartmentId, byId2.getDepartmentId()).orderByDesc(MwCheckoutRecord::getCheckoutTime).list();
List<CheckOutDto> backList = new ArrayList<>();
for (MwCheckoutRecord mwCheckoutRecord : list) {
CheckOutDto checkOutDto = new CheckOutDto();
--
Gitblit v1.7.1