From 7dff38876f582644ae95daad8ac21d4f57088d56 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:19:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
index 6ee669b..dd5551a 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCollectRecordMapper.java
@@ -6,6 +6,7 @@
 import com.sinata.system.domain.dto.CollectCarTotalUpDto;
 import com.sinata.system.domain.dto.CollectDto;
 import com.sinata.system.domain.dto.CollectTotalUpDto;
+import com.sinata.system.domain.query.DisposalReportQuery;
 import com.sinata.system.domain.query.MwCollectRecordQuery;
 import com.sinata.system.domain.vo.MedicalWasteProcessVO;
 import com.sinata.system.domain.vo.MwCollectRecordVO;
@@ -64,4 +65,13 @@
     List<CollectTotalUpDto> collectTotal1(@Param("date")LocalDate date,@Param("checkOutUserId")Long checkOutUserId,@Param("id") Long id);
 
     List<CollectCarTotalUpDto> carGroup(@Param("carId")Long carId);
+
+    /**
+     * 监管报表医疗废物产生列表
+     *
+     * @param query
+     * @param treeCode
+     * @return
+     */
+    List<MwCollectRecordVO> getRegulationReportList(@Param("query") DisposalReportQuery query, @Param("treeCode") String treeCode);
 }

--
Gitblit v1.7.1