From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
index 7bf9bcc..58e3dac 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
@@ -9,12 +9,17 @@
import com.sinata.system.domain.MwCheckoutRecord;
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.MwCheckoutRecordItemQuery;
import com.sinata.system.domain.query.MwTransitRecordQuery;
+import com.sinata.system.domain.query.TransformQuery;
import com.sinata.system.domain.vo.MwCheckoutRecordExcelVO;
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 com.sinata.system.mapper.MwCheckoutRecordMapper;
import com.sinata.system.service.MwCheckoutRecordService;
import com.sinata.system.service.SysDepartmentService;
@@ -85,6 +90,22 @@
return this.baseMapper.totalUp(date,departmentId);
}
@Override
+ public List<CollectTotalUpDto> totalUp4(Long departmentId) {
+ return this.baseMapper.totalUp4(departmentId);
+ }
+ @Override
+ public List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, Long departmentId) {
+ return this.baseMapper.totalUp2(date1,date2,departmentId);
+ }
+ @Override
+ public List<CollectTotalUpDto> totalUp5( Long departmentId) {
+ return this.baseMapper.totalUp5(departmentId);
+ }
+ @Override
+ public List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId) {
+ return this.baseMapper.totalUp3(date1,date2,departmentId);
+ }
+ @Override
public List<CollectTotalUpDto> totalUp1( Long outId) {
return this.baseMapper.totalUp1(outId);
}
@@ -150,4 +171,38 @@
Page<MwMedicalWasteBoxVO> page = baseMapper.transitDetailPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getId());
return PageDTO.of(page);
}
+
+ /**
+ * 转移联单数据
+ *
+ * @param query
+ * @param treeCode
+ * @return
+ */
+ @Override
+ public List<TransformVO> getCheckoutRecordList(TransformQuery query, String treeCode) {
+ return baseMapper.getCheckoutRecordList(query, treeCode);
+ }
+
+ /**
+ * 监管报表医疗废物转移列表
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query) {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ return baseMapper.getRegulationReportList(query, treeCode);
+ }
+
+ /**
+ * 车辆转运异常预警
+ *
+ * @return
+ */
+ @Override
+ public List<MwTransitCarWarningVO> queryWarningList() {
+ return baseMapper.queryWarningList();
+ }
}
--
Gitblit v1.7.1