From aded6d51dd8cc3b7d2b5a9a0be54378c5b2ee924 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 15:11:15 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/mapper/MwDisposalRecordMapper.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwDisposalRecordMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwDisposalRecordMapper.java
index 1ebc082..6e64d10 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwDisposalRecordMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwDisposalRecordMapper.java
@@ -5,10 +5,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.query.MwDisposalRecordQuery;
+import com.sinata.system.domain.vo.DisposalRecordStaticsVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.domain.vo.MwDisposalRecordItemVO;
import com.sinata.system.domain.vo.MwDisposalRecordReportVO;
import com.sinata.system.domain.vo.MwDisposalRecordVO;
+import com.sinata.system.domain.vo.MwDisposalRecordWarningVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -31,7 +33,7 @@
* @param treeCode
* @return
*/
- List<MwDisposalRecordVO> getStaticsData(@Param("query") MwDisposalRecordQuery query, @Param("treeCode") String treeCode);
+ DisposalRecordStaticsVO getStaticsData(@Param("query") MwDisposalRecordQuery query, @Param("treeCode") String treeCode);
/**
* 处置显示分页列表
@@ -59,7 +61,7 @@
* @param type
* @return
*/
- List<MwDisposalRecordReportVO> disposalReportByType(@Param("query") DisposalReportQuery query, @Param("type") Integer type);
+ List<MwDisposalRecordReportVO> disposalReceiveReport(@Param("query") DisposalReportQuery query);
/**
* 监管报表医疗废物处置列表
@@ -70,4 +72,10 @@
*/
List<MwCollectRecordVO> getRegulationReportList(@Param("query") DisposalReportQuery query, @Param("treeCode") String treeCode);
+ /**
+ * 处置单位存储量预警数据
+ *
+ * @return
+ */
+ List<MwDisposalRecordWarningVO> queryDisposalListByDepartment();
}
--
Gitblit v1.7.1