From 0852acae13603be95eaaa0b501f3441508ff3fe5 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 14 四月 2025 09:52:12 +0800 Subject: [PATCH] 大屏统计修改 --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwDisposalRecordServiceImpl.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwDisposalRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwDisposalRecordServiceImpl.java index fd72934..d2ad543 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwDisposalRecordServiceImpl.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwDisposalRecordServiceImpl.java @@ -8,11 +8,13 @@ import com.sinata.system.domain.query.DisposalReportQuery; import com.sinata.system.domain.query.MwDisposalRecordItemQuery; import com.sinata.system.domain.query.MwDisposalRecordQuery; +import com.sinata.system.domain.vo.DepartmentTagInfoVO; 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 com.sinata.system.mapper.MwDisposalHandleRecordMapper; import com.sinata.system.mapper.MwDisposalRecordMapper; import com.sinata.system.service.MwDisposalRecordService; @@ -48,6 +50,10 @@ DisposalRecordStaticsVO vo = null; if (StringUtils.isNotBlank(treeCode)) { vo = baseMapper.getStaticsData(query, treeCode); + DisposalRecordStaticsVO disposalRecordStaticsVO = baseMapper.getDisposalData(query, + treeCode); + vo.setTotalHandledQuantity(disposalRecordStaticsVO.getTotalHandledQuantity()); + vo.setTotalHandledWeight(disposalRecordStaticsVO.getTotalHandledWeight()); } return vo; } @@ -65,6 +71,12 @@ return PageDTO.empty(0L, 0L); } Page<MwDisposalRecordVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode); + page.getRecords().forEach(item -> { + Long id = item.getId(); + MwDisposalRecordVO vo = baseMapper.getDisposalDataById(id); + item.setTotalHandledQuantity(vo.getTotalHandledQuantity()); + item.setTotalHandledWeight(vo.getTotalHandledWeight()); + }); return PageDTO.of(page); } @@ -102,4 +114,25 @@ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId()); return baseMapper.getRegulationReportList(query, treeCode); } + + /** + * 处置单位存储量预警数据 + * + * @return + */ + @Override + public List<MwDisposalRecordWarningVO> queryDisposalListByDepartment() { + return baseMapper.queryDisposalListByDepartment(); + } + + /** + * 获取大屏单位标签信息 + * + * @param id + * @return + */ + @Override + public DepartmentTagInfoVO getTagInfo(Long id) { + return baseMapper.getTagInfo(id); + } } -- Gitblit v1.7.1