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/MwCollectRecordService.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java index ecefd14..900bb3f 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java @@ -3,10 +3,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.sinata.common.entity.PageDTO; 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; import com.sinata.system.domain.query.MwCollectRecordQuery; import com.sinata.system.domain.vo.MedicalWasteProcessVO; import com.sinata.system.domain.vo.MwCollectRecordVO; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.LocalDate; +import java.util.List; /** * <p> @@ -39,6 +47,8 @@ * @param dto */ void edit(MwCollectRecordDTO dto); + List<CollectDto> getGroup(String boxNumber,Long departmentId); + List<CollectDto> getGroup1(String boxNumber,Long departmentId); /** * 流转过程 @@ -47,4 +57,11 @@ * @return */ MedicalWasteProcessVO getProcess(Long id); + + void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException; + + List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId); + List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long hospitalId); + + List<CollectCarTotalUpDto> carGroup(Long carId); } -- Gitblit v1.7.1