From 196ac84b6ec0dd05304dd6577f169f7fbf5fe726 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:13:18 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
index ec92e1b..be6be7d 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
@@ -85,7 +85,13 @@
@Override
public List<CollectDto> getGroup(String boxNumber,Long departmentId) {
return this.baseMapper.getGroup(boxNumber,departmentId);
- } @Override
+ }
+ @Override
+ public List<CollectDto> getGroupWithStatus(String boxNumber,Long departmentId,Integer status) {
+ return this.baseMapper.getGroupWithStatus(boxNumber,departmentId,status);
+ }
+
+ @Override
public List<CollectDto> getGroup1(String boxNumber,Long departmentId) {
return this.baseMapper.getGroup1(boxNumber,departmentId);
}
@@ -134,6 +140,10 @@
return baseMapper.collectTotal(date,departmentId);
}
@Override
+ public List<CollectTotalUpDto> collectTotal3(Long departmentId) {
+ return baseMapper.collectTotal3(departmentId);
+ }
+ @Override
public List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long id ) {
return baseMapper.collectTotal1(date,checkOutUserId,id);
}
--
Gitblit v1.7.1