From cf49f4f936a11b27de3f9ec3cbb50603f3b1cd5b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:16:18 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 9d59890..1793c66 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
@@ -6,6 +6,7 @@
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwCollectRecord;
+import com.sinata.system.domain.dto.CollectCarTotalUpDto;
import com.sinata.system.domain.dto.CollectDto;
import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.domain.dto.MwCollectRecordDTO;
@@ -83,6 +84,9 @@
@Override
public List<CollectDto> getGroup(String boxNumber,Long departmentId) {
return this.baseMapper.getGroup(boxNumber,departmentId);
+ } @Override
+ public List<CollectDto> getGroup1(String boxNumber,Long departmentId) {
+ return this.baseMapper.getGroup1(boxNumber,departmentId);
}
/**
@@ -116,4 +120,13 @@
public List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId) {
return baseMapper.collectTotal(date,departmentId);
}
+ @Override
+ public List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long id ) {
+ return baseMapper.collectTotal1(date,checkOutUserId,id);
+ }
+
+ @Override
+ public List<CollectCarTotalUpDto> carGroup(Long carId) {
+ return this.baseMapper.carGroup(carId);
+ }
}
--
Gitblit v1.7.1