From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 02 一月 2025 10:55:24 +0800 Subject: [PATCH] merge --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 67 +++++++++++++++++++++++++++++++++ 1 files changed, 67 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 1a34578..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 @@ -7,13 +7,19 @@ import com.sinata.common.utils.BeanUtils; 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 +29,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; /** @@ -75,6 +83,31 @@ String fileName = URLEncoder.encode("转运记录", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); 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); } /** @@ -138,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