From 488b9158fc873d228c2c0106050ece8272a49653 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 25 十二月 2024 10:36:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java index c03641c..06f8cf2 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java @@ -3,12 +3,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.sinata.common.entity.PageDTO; import com.sinata.system.domain.MwCheckoutRecord; +import com.sinata.system.domain.dto.CollectTotalUpDto; import com.sinata.system.domain.query.CheckoutRecordQuery; import com.sinata.system.domain.query.MwCheckoutRecordItemQuery; import com.sinata.system.domain.query.MwTransitRecordQuery; import com.sinata.system.domain.vo.MwCheckoutRecordVO; import com.sinata.system.domain.vo.MwMedicalWasteBoxVO; import com.sinata.system.domain.vo.MwTransitRecordVO; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.LocalDate; +import java.util.List; /** * <p> @@ -50,4 +56,31 @@ * @return */ PageDTO<MwTransitRecordVO> transitPageList(MwTransitRecordQuery query); + + /** + * 运输记录详情 + * + * @param id + * @return + */ + MwTransitRecordVO transitDetail(Long id); + + /** + * 运输记录详情分页列表 + * + * @param query + * @return + */ + PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(MwTransitRecordQuery query); + + /** + * 转运记录导出 + * + * @param query + * @param response + */ + void checkoutRecordExport(CheckoutRecordQuery query, HttpServletResponse response) throws IOException; + + List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId); + List<CollectTotalUpDto> totalUp1(Long outId); } -- Gitblit v1.7.1