From 75aa42c51ae2a63d7c1e5e813c0a88fd303bdbf4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 03 一月 2025 18:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 150 insertions(+), 0 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
new file mode 100644
index 0000000..79d24ae
--- /dev/null
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java
@@ -0,0 +1,150 @@
+package com.sinata.web.controller.applet;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.collect.Lists;
+import java.util.Date;
+
+import com.sinata.common.core.domain.R;
+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.dto.CheckOutDto;
+import com.sinata.system.domain.dto.CollectTotalUpDto;
+import com.sinata.system.domain.query.CheckoutRecordQuery;
+import com.sinata.system.domain.query.MwCheckoutRecordItemQuery;
+import com.sinata.system.domain.query.MwTransitRecordQuery;
+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.*;
+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.*;
+
+import javax.naming.ldap.PagedResultsControl;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 暂存间出库记录 前端控制器
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-12-02
+ */
+@Api(tags = {"医院工作人员"})
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/applet/mwCheckoutRecord")
+public class AppMwCheckoutRecordController {
+ 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(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ 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::getDepartmentId, byId2.getDepartmentId()).orderByDesc(MwCheckoutRecord::getCheckoutTime).list();
+ List<CheckOutDto> backList = new ArrayList<>();
+ for (MwCheckoutRecord 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.getCheckoutTime());
+ List<CollectTotalUpDto> records = mwCheckoutRecordService.totalUp1(mwCheckoutRecord.getId());
+ checkOutDto.setRecords(records);
+ backList.add(checkOutDto);
+ }
+ return R.ok(backList);
+ }
+
+
+}
--
Gitblit v1.7.1