| | |
| | | List<TransformVO> checkoutRecordVOList = mwCheckoutRecordService.getCheckoutRecordList(query, region.getTreeCode()); |
| | | if (CollUtils.isNotEmpty(checkoutRecordVOList)) { |
| | | //查询医废类型 |
| | | List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList()).list(); |
| | | List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList()).orderByDesc(SysDictData::getDictCode).list(); |
| | | if (CollUtils.isNotEmpty(wasteTypeList)) { |
| | | vo.setLegend(wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList())); |
| | | vo.getLegend().add("小计"); |
| | |
| | | //处置 |
| | | for (SysDictData sysDictData : wasteTypeList) { |
| | | BigDecimal totalWeight = disposaledList.stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode()) && |
| | | finalSdf.format(item.getReceiveTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight) |
| | | finalSdf.format(item.getDisposalTime()).equals(date)).map(MwDisposalRecordReportVO::getWeight) |
| | | .reduce(BigDecimal.ZERO, BigDecimal::add); |
| | | departmentReportItemVO.getData().add(totalWeight); |
| | | } |
| | |
| | | } |
| | | for (SysDictData sysDictData : wasteTypeList) { |
| | | BigDecimal weight = checkoutRecordList.stream().filter(e -> e.getWasteType().equals(sysDictData.getDictCode()) && |
| | | finalSdf.format(e.getCollectTime()).equals(date)).map(MwCollectRecordVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); |
| | | finalSdf.format(e.getCheckoutTime()).equals(date)).map(MwCollectRecordVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); |
| | | departmentReportItemVO.getData().add(weight); |
| | | } |
| | | for (SysDictData sysDictData : wasteTypeList) { |