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/mapper/MwCollectRecordMapper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
index 510fa92..ccc803a 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
@@ -64,6 +64,8 @@
 
     List<CollectDto> getGroup(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId);
     List<CollectDto> getGroup1(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId);
+    List<CollectDto> getGroup2(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId);
+    List<CollectDto> getGroup3(@Param("boxNumber")String boxNumber,@Param("departmentId")Long departmentId,@Param("carId")Long carId);
     List<CollectDto> getGroupWithStatus(@Param("boxNumber")String boxNumber, @Param("departmentId")Long departmentId, @Param("status")Integer status);
 
 
@@ -71,7 +73,7 @@
     List<CollectTotalUpDto> collectTotal3(@Param("departmentId")Long departmentId);
     List<CollectTotalUpDto> collectTotal1(@Param("date")LocalDate date,@Param("checkOutUserId")Long checkOutUserId,@Param("id") Long id);
 
-    List<CollectCarTotalUpDto> carGroup(@Param("carId")Long carId);
+    List<CollectCarTotalUpDto> carGroup(@Param("carId")Long carId,@Param("name") String name);
 
     /**
      * 监管报表医疗废物产生列表

--
Gitblit v1.7.1