From 05628d269dff7ad4f2e9d3419b05b4e7e5768797 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 12 二月 2025 14:19:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 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 0ff945a..79d24ae 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
@@ -1,4 +1,5 @@
package com.sinata.web.controller.applet;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.collect.Lists;
import java.util.Date;
@@ -7,6 +8,8 @@
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.dto.CheckOutDto;
import com.sinata.system.domain.dto.CollectTotalUpDto;
@@ -16,13 +19,12 @@
import com.sinata.system.domain.vo.MwCheckoutRecordVO;
import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
import com.sinata.system.domain.vo.MwTransitRecordVO;
-import com.sinata.system.service.ISysUserService;
-import com.sinata.system.service.MwCheckoutRecordService;
-import com.sinata.system.service.MwTransitCarService;
+import com.sinata.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -51,20 +53,84 @@
private final MwCheckoutRecordService mwCheckoutRecordService;
private final ISysUserService userService;
private final MwTransitCarService carService;
+ private final MwDisposalRecordService disposalRecordService;
+ private final MwDisposalHandleRecordService handleRecordService;
@ApiOperation(value = "出库统计上")
@PostMapping("/total")
- public R<List<CollectTotalUpDto>> total(LocalDate date) {
+ 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) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ return R.ok(mwCheckoutRecordService.totalUp2(date1,date2,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 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<CheckOutDto> backList = new ArrayList<>();
+ for (MwDisposalRecord 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());
+ checkOutDto.setCheckoutTime(mwCheckoutRecord.getReceiveTime());
+ List<CollectTotalUpDto> records = mwCheckoutRecordService.totalUp6(mwCheckoutRecord.getId());
+ checkOutDto.setRecords(records);
+ backList.add(checkOutDto);
+ }
+ return R.ok(backList);
+ }
+
+ @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()));
+ }
+
+ @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();
+ 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<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());
+ checkOutDto.setCheckoutTime(mwCheckoutRecord.getDisposalTime());
+ List<CollectTotalUpDto> records = mwCheckoutRecordService.totalUp1(mwCheckoutRecord.getId());
+ checkOutDto.setRecords(records);
+ backList.add(checkOutDto);
+ }
+ return R.ok(backList);
+ }
+
+
+
+
@ApiOperation(value = "出库统计下")
@PostMapping("/record")
public R<List<CheckOutDto>> record() {
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().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