From cf49f4f936a11b27de3f9ec3cbb50603f3b1cd5b Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 28 十二月 2024 16:16:18 +0800 Subject: [PATCH] merge --- medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 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 1fd5d41..8c3b7a4 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,7 @@ 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.MwTransitRecordQuery; import com.sinata.system.domain.vo.MwCheckoutRecordVO; @@ -10,6 +11,9 @@ import com.sinata.system.domain.vo.MwTransitRecordVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.util.List; /** * <p> @@ -57,4 +61,32 @@ * @return */ Page<MwTransitRecordVO> transitPageList(Page<MwTransitRecordVO> page, @Param("query") MwTransitRecordQuery query, String treeCode); + + /** + * 运输记录详情 + * + * @param id + * @return + */ + MwTransitRecordVO transitDetail(Long id); + + /** + * 运输记录详情分页列表 + * + * @param objectPage + * @param id + * @return + */ + Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> objectPage, Long id); + + /** + * 转运记录导出 + * + * @param query + * @param treeCode + */ + List<MwCheckoutRecordVO> hospitalTransitList(@Param("query") CheckoutRecordQuery query, @Param("treeCode") String treeCode); + + List<CollectTotalUpDto> totalUp(@Param("date") LocalDate date, @Param("departmentId")Long departmentId); + List<CollectTotalUpDto> totalUp1(@Param("outId")Long outId); } -- Gitblit v1.7.1