From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 01 一月 2025 10:14:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 18 ++++++++++++++++++ 1 files changed, 18 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 a7bdde7..cdc6cfe 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,6 +3,7 @@ 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.DisposalReportQuery; import com.sinata.system.domain.query.MwCheckoutRecordItemQuery; @@ -11,11 +12,14 @@ import com.sinata.system.domain.vo.MwCheckoutRecordVO; import com.sinata.system.domain.vo.MwCollectRecordVO; import com.sinata.system.domain.vo.MwMedicalWasteBoxVO; +import com.sinata.system.domain.vo.MwTransitCarWarningVO; import com.sinata.system.domain.vo.MwTransitRecordVO; import com.sinata.system.domain.vo.TransformVO; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.time.LocalDate; +import java.util.List; import java.util.List; /** @@ -99,4 +103,18 @@ * @return */ List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query); + + List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId); + List<CollectTotalUpDto> totalUp4(Long departmentId); + List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, Long departmentId); + List<CollectTotalUpDto> totalUp5(Long departmentId); + List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId); + List<CollectTotalUpDto> totalUp1(Long outId); + + /** + * 车辆转运异常预警 + * + * @return + */ + List<MwTransitCarWarningVO> queryWarningList(); } -- Gitblit v1.7.1