From ccd758bcd9b357b365c28f62efde203faa83fb93 Mon Sep 17 00:00:00 2001 From: luoyisheng <yangdongji@argo-ai.cn> Date: 星期一, 24 二月 2025 14:45:10 +0800 Subject: [PATCH] bug --- medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java index 3909529..0eb0152 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sinata.system.domain.MwCheckoutRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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.MwTransitRecordQuery; @@ -16,6 +18,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.time.LocalDate; import java.util.List; /** @@ -41,10 +44,10 @@ /** * 转运记录详情 * - * @param departmentId + * @param id * @return */ - MwCheckoutRecordVO hospitalDetail(Long departmentId); + MwCheckoutRecordVO hospitalDetail(Long id); /** * 转运记录医废详情分页列表 @@ -80,7 +83,7 @@ * @param id * @return */ - Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> objectPage, Long id); + Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> page, @Param("id") Long id); /** * 转运记录导出 @@ -90,6 +93,14 @@ */ List<MwCheckoutRecordVO> hospitalTransitList(@Param("query") CheckoutRecordQuery query, @Param("treeCode") String treeCode); + List<CollectTotalUpDto> totalUp(@Param("date") LocalDate date, @Param("departmentId")Long departmentId); + List<CollectTotalUpDto> totalUp4(@Param("departmentId")Long departmentId); + List<CollectTotalUpDto> totalUp2(@Param("date1") LocalDate date1, @Param("date2") LocalDate date2,@Param("departmentId")Long departmentId); + List<CollectTotalUpDto> totalUp5(@Param("departmentId")Long departmentId); + List<CollectTotalUpDto> totalUp3(@Param("date1") LocalDate date1, @Param("date2") LocalDate date2,@Param("departmentId")Long departmentId); + List<CollectTotalUpDto> totalUp1(@Param("outId")Long outId); + List<CollectTotalUpDto> totalUp6(@Param("outId")Long outId); + /** * 转移联单数据 * -- Gitblit v1.7.1