From 4a8c7756c66e2c5128dc9974ff7d3335deb903e4 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 03 一月 2025 14:18:48 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 c835559..cad750f 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
@@ -98,7 +98,14 @@
public List<CollectDto> getGroup1(String boxNumber,Long departmentId) {
return this.baseMapper.getGroup1(boxNumber,departmentId);
}
-
+ @Override
+ public List<CollectDto> getGroup2(String boxNumber,Long departmentId) {
+ return this.baseMapper.getGroup2(boxNumber,departmentId);
+ }
+ @Override
+ public List<CollectDto> getGroup3(String boxNumber,Long departmentId,Long carId) {
+ return this.baseMapper.getGroup3(boxNumber,departmentId,carId);
+ }
/**
* 流转过程
*
@@ -152,8 +159,8 @@
}
@Override
- public List<CollectCarTotalUpDto> carGroup(Long carId) {
- return this.baseMapper.carGroup(carId);
+ public List<CollectCarTotalUpDto> carGroup(Long carId,String name) {
+ return this.baseMapper.carGroup(carId,name);
}
/**
--
Gitblit v1.7.1