From ccb5d44c524d0f941b173418586d4b7ed8e93530 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 三月 2025 17:07:57 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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..f2e2b0c 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
@@ -44,10 +44,10 @@
/**
* 转运记录详情
*
- * @param departmentId
+ * @param id
* @return
*/
- MwCheckoutRecordVO hospitalDetail(Long departmentId);
+ MwCheckoutRecordVO hospitalDetail(Long id);
/**
* 转运记录医废详情分页列表
@@ -83,7 +83,7 @@
* @param id
* @return
*/
- Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> objectPage, Long id);
+ Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> page, @Param("id") Long id);
/**
* 转运记录导出
@@ -95,10 +95,11 @@
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> 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