From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 二月 2025 13:40:06 +0800
Subject: [PATCH] 管理后台bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 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 1a34578..92e6def 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
@@ -1,19 +1,28 @@
package com.sinata.system.service.impl;
+import cn.hutool.core.date.DateUtil;
import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.BeanUtils;
+import com.sinata.common.utils.CollUtils;
+import com.sinata.common.utils.DateUtils;
import com.sinata.common.utils.StringUtils;
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;
@@ -23,6 +32,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.util.Collections;
import java.util.List;
/**
@@ -77,15 +88,44 @@
FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcelVO.class).sheet("转运记录").doWrite(mwCheckoutRecordExcelVOS);
}
+ @Override
+ public List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId) {
+ 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);
+ }
+
+ @Override
+ public List<CollectTotalUpDto> totalUp6( Long outId) {
+ return this.baseMapper.totalUp6(outId);
+ }
/**
* 转运记录详情
*
- * @param departmentId
+ * @param id
* @return
*/
@Override
- public MwCheckoutRecordVO hospitalDetail(Long departmentId) {
- return baseMapper.hospitalDetail(departmentId);
+ public MwCheckoutRecordVO hospitalDetail(Long id) {
+ return baseMapper.hospitalDetail(id);
}
/**
@@ -112,6 +152,14 @@
if (StringUtils.isBlank(treeCode)) {
return PageDTO.empty(0L, 0L);
}
+ if (CollUtils.isNotEmpty(query.getStartTime())) {
+ query.setStartTimeStart(DateUtil.parse(query.getStartTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ query.setStartTimeEnd(DateUtil.parse(query.getStartTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ }
+ if (CollUtils.isNotEmpty(query.getEndTime())) {
+ query.setEndTimeStart(DateUtil.parse(query.getEndTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ query.setEndTimeEnd(DateUtil.parse(query.getEndTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ }
Page<MwTransitRecordVO> page = baseMapper.transitPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
return PageDTO.of(page);
}
@@ -138,4 +186,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