From 6868940dd432de9d48f5128be700ff97867ebc39 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 11:24:18 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
index c5f21b9..c91369f 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
@@ -206,11 +206,11 @@
@ApiOperation(value = "确认接受",tags = "处置人员")
@PostMapping("/end/down/collect/confirm")
- public R tanscollecttotal4(String boxNum) {
+ public R tanscollecttotal4(@RequestParam BoxListDto boxListDto) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
SysDepartment byId = departmentService.getById(sysUser.getDepartmentId());
//将record变为已接受
- List<MwCollectRecord> list = collectRecordService.lambdaQuery().eq(MwCollectRecord::getStatus,2).eq(MwCollectRecord::getBoxNumber, boxNum).list();
+ List<MwCollectRecord> list = collectRecordService.lambdaQuery().eq(MwCollectRecord::getStatus,2).eq(MwCollectRecord::getBoxNumber, boxListDto.getBoxNum()).list();
Set<String> boxes = new HashSet<>();
BigDecimal receiveQuantity = BigDecimal.ZERO;
for (MwCollectRecord mwCollectRecord : list) {
--
Gitblit v1.7.1