From 9bb7dcfc74c142fe1514cd2580cb6f0d64ca45fd Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 24 十二月 2024 10:28:30 +0800 Subject: [PATCH] merge --- medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java | 7 +++++++ 1 files changed, 7 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 2583997..e4f6fea 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,6 +3,8 @@ 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.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; @@ -10,6 +12,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.time.LocalDate; +import java.util.List; /** * <p> @@ -42,6 +46,7 @@ * @param dto */ void edit(MwCollectRecordDTO dto); + List<CollectDto> getGroup(String boxNumber,Long departmentId); /** * 流转过程 @@ -52,4 +57,6 @@ MedicalWasteProcessVO getProcess(Long id); void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException; + + List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId); } -- Gitblit v1.7.1