From 2f3d3fb97bd4ebdc00c40a2774465c8b3487b6d1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 02 四月 2025 17:14:27 +0800
Subject: [PATCH] bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
index dd2aca7..735cdf0 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
@@ -217,8 +217,6 @@
vo.setLegend(wasteTypeList.stream().map(SysDictDataVO::getDictLabel).collect(Collectors.toList()));
vo.getLegend().add("小计");
String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
- List<SysDictData> medicalWasteTypeList = sysDictDataService.lambdaQuery().eq(SysDictData::getDictType, "medical_waste_type").orderByDesc(SysDictData::getDictCode).list();
-
List<MwMicroEquipmentStaticsVO> staticsData = baseMapper.getStaticsData(query, treeCode);
SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.YYYY_MM_DD_HH_MM_SS);
switch (query.getDateType()) {
@@ -241,7 +239,7 @@
SimpleDateFormat finalSdf = sdf;
BigDecimal totalWeight = BigDecimal.ZERO;
BigDecimal totalCount = BigDecimal.ZERO;
- for (SysDictData sysDictData : medicalWasteTypeList) {
+ for (SysDictDataVO sysDictData : wasteTypeList) {
BigDecimal weight = staticsData.stream().filter(e -> e.getWasteType().equals(sysDictData.getDictCode())
&& finalSdf.format(e.getUseTime()).equals(date)
).map(MwMicroEquipmentStaticsVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
@@ -264,13 +262,13 @@
totalRow.setData(new ArrayList<>());
// 计算各类型废物的重量和数量总计
- for (SysDictData sysDictData : medicalWasteTypeList) {
+ for (SysDictDataVO sysDictData : wasteTypeList) {
BigDecimal totalTypeWeight = BigDecimal.ZERO;
BigDecimal totalTypeCount = BigDecimal.ZERO;
for (DepartmentReportItemVO item : result) {
// 每种废物类型占用两列(重量和数量)
- int index = medicalWasteTypeList.indexOf(sysDictData);
+ int index = wasteTypeList.indexOf(sysDictData);
int weightIndex = index * 2;
int countIndex = weightIndex + 1;
--
Gitblit v1.7.1