From 0184bf471382f9328df9bdd47acf451e4e2c5cb0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 11 六月 2025 13:57:37 +0800
Subject: [PATCH] 达梦数据库及数据库脚本

---
 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java |   17 +++++++++--------
 1 files changed, 9 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 189bac0..441753b 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,12 +3,12 @@
 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;
@@ -44,10 +44,10 @@
     /**
      * 转运记录详情
      *
-     * @param departmentId
+     * @param id
      * @return
      */
-    MwCheckoutRecordVO hospitalDetail(Long departmentId);
+    MwCheckoutRecordVO hospitalDetail(Long id);
 
     /**
      * 转运记录医废详情分页列表
@@ -71,10 +71,9 @@
     /**
      * 运输记录详情
      *
-     * @param id
-     * @return
+     * @param query@return
      */
-    MwTransitRecordVO transitDetail(Long id);
+    MwTransitRecordVO transitDetail(@Param("query") TransitRecordQuery query);
 
     /**
      * 运输记录详情分页列表
@@ -83,7 +82,7 @@
      * @param id
      * @return
      */
-    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> objectPage, Long id);
+    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> page, @Param("query") TransitRecordQuery query);
 
     /**
      * 转运记录导出
@@ -95,10 +94,12 @@
 
     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> totalUp2(@Param("date") LocalDate date ,@Param("departmentId")Long departmentId);
+    List<CollectTotalUpDto> totalUp22(@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);
 
     /**
      * 转移联单数据

--
Gitblit v1.7.1