From 0852acae13603be95eaaa0b501f3441508ff3fe5 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 14 四月 2025 09:52:12 +0800 Subject: [PATCH] 大屏统计修改 --- medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 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 8f00d1a..bee052f 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 @@ -9,6 +9,7 @@ import com.sinata.system.domain.query.MwCheckoutRecordItemQuery; import com.sinata.system.domain.query.MwTransitRecordQuery; import com.sinata.system.domain.query.TransformQuery; +import com.sinata.system.domain.query.TransitRecordQuery; import com.sinata.system.domain.vo.MwCheckoutRecordVO; import com.sinata.system.domain.vo.MwCollectRecordVO; import com.sinata.system.domain.vo.MwMedicalWasteBoxVO; @@ -19,7 +20,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.time.LocalDate; -import java.util.List; import java.util.List; /** @@ -67,9 +67,10 @@ * 运输记录详情 * * @param id + * @param query * @return */ - MwTransitRecordVO transitDetail(Long id); + MwTransitRecordVO transitDetail(TransitRecordQuery query); /** * 运输记录详情分页列表 @@ -77,7 +78,7 @@ * @param query * @return */ - PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(MwTransitRecordQuery query); + PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(TransitRecordQuery query); /** * 转运记录导出 @@ -106,7 +107,8 @@ List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId); List<CollectTotalUpDto> totalUp4(Long departmentId); - List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, Long departmentId); + List<CollectTotalUpDto> totalUp2(LocalDate date1, Long departmentId); + List<CollectTotalUpDto> totalUp22(LocalDate date1, Long departmentId); List<CollectTotalUpDto> totalUp5(Long departmentId); List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId); List<CollectTotalUpDto> totalUp1(Long outId); -- Gitblit v1.7.1