From 1f5ef3a86b1227f49c6840b2205174e4ab2f0f14 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 15:49:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN

---
 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 8 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 f4c8c7e..dd94589 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
@@ -1,16 +1,24 @@
 package com.sinata.system.mapper;
 
+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;
+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;
+import com.sinata.system.domain.vo.MwTransitCarWarningVO;
 import com.sinata.system.domain.vo.MwTransitRecordVO;
+import com.sinata.system.domain.vo.TransformVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -36,10 +44,10 @@
     /**
      * 转运记录详情
      *
-     * @param departmentId
+     * @param id
      * @return
      */
-    MwCheckoutRecordVO hospitalDetail(Long departmentId);
+    MwCheckoutRecordVO hospitalDetail(Long id);
 
     /**
      * 转运记录医废详情分页列表
@@ -58,15 +66,14 @@
      * @param treeCode
      * @return
      */
-    Page<MwTransitRecordVO> transitPageList(Page<MwTransitRecordVO> page, @Param("query") MwTransitRecordQuery query, String treeCode);
+    Page<MwTransitRecordVO> transitPageList(Page<MwTransitRecordVO> page, @Param("query") MwTransitRecordQuery query, @Param("treeCode") String treeCode);
 
     /**
      * 运输记录详情
      *
-     * @param id
-     * @return
+     * @param query@return
      */
-    MwTransitRecordVO transitDetail(Long id);
+    MwTransitRecordVO transitDetail(@Param("query") TransitRecordQuery query);
 
     /**
      * 运输记录详情分页列表
@@ -75,7 +82,7 @@
      * @param id
      * @return
      */
-    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> objectPage, Long id);
+    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> page, @Param("query") TransitRecordQuery query);
 
     /**
      * 转运记录导出
@@ -84,4 +91,37 @@
      * @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> totalUp4(@Param("departmentId")Long departmentId);
+    List<CollectTotalUpDto> totalUp2(@Param("date") LocalDate date ,@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);
+
+    /**
+     * 转移联单数据
+     *
+     * @param query
+     * @param treeCode
+     * @return
+     */
+    List<TransformVO> getCheckoutRecordList(@Param("query") TransformQuery query, @Param("treeCode") String treeCode);
+
+    /**
+     * 监管报表医疗废物转移列表
+     *
+     * @param query
+     * @param treeCode
+     * @return
+     */
+    List<MwCollectRecordVO> getRegulationReportList(@Param("query") DisposalReportQuery query, @Param("treeCode") String treeCode);
+
+    /**
+     * 车辆转运异常预警
+     *
+     * @return
+     */
+    List<MwTransitCarWarningVO> queryWarningList();
 }

--
Gitblit v1.7.1