From d554630cee36c2eecd8dd293bd9f3b280bf1bc67 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 07 四月 2025 11:32:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 2 +-
medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml | 2 +-
2 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 5163bef..d3854a5 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
@@ -503,7 +503,7 @@
@ApiOperation("库存详情")
@PostMapping("/record1")
public R<List<MwCollectRecord>> record1(@RequestParam String boxNumber) {
- List<MwCollectRecord> list = collectRecordService.lambdaQuery().isNull(MwCollectRecord::getCheckoutTime).eq(MwCollectRecord::getBoxNumber, boxNumber).orderByDesc(MwCollectRecord::getCollectTime).list();
+ List<MwCollectRecord> list = collectRecordService.lambdaQuery().isNull(MwCollectRecord::getCheckoutTime).eq(MwCollectRecord::getStatus ,1).eq(MwCollectRecord::getBoxNumber, boxNumber).orderByDesc(MwCollectRecord::getCollectTime).list();
return R.ok(list);
}
diff --git a/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml b/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml
index bc8e7d5..51c9cb3 100644
--- a/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml
+++ b/medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml
@@ -311,7 +311,7 @@
SELECT WASTE_TYPE as wasteType, WASTE_TYPE_STR as wasteTypeStr, COUNT(DISTINCT BOX_NUMBER) as boxNum, COUNT(1) as num, sum(WEIGHT) as weight
FROM MEDICAL_WASTE.MW_COLLECT_RECORD
<where>
- RECEIVE_USER_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId}
+ RECEIVE_USER_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId} and STATUS = 4
<if test="date != null">
AND TRUNC(RECEIVE_TIME) = TO_DATE(#{date}, 'YYYY-MM-DD')
</if>
--
Gitblit v1.7.1