From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java
index 5631976..8a2380f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java
@@ -125,7 +125,9 @@
mdcAlarmDto.setKey(equipmentId);
Integer count = mdcEquipmentRunningSectionService.findAlarmCount(equipmentId, startDate, endDate, vo.getAlarmCode());
mdcAlarmDto.setCount(count);
- equipmentCountList.add(mdcAlarmDto);
+ if (count != 0) {
+ equipmentCountList.add(mdcAlarmDto);
+ }
}
result.setEquipmentCountList(equipmentCountList);
}
@@ -139,8 +141,8 @@
for (String date : datesStringList) {
MdcAlarmDto mdcAlarmDto = new MdcAlarmDto();
mdcAlarmDto.setKey(DateUtils.format(DateUtils.toDate(date, DateUtils.STR_DATE), DateUtils.STR_MMDD));
- String startDate = DateUtils.format(DateUtils.toDate(date, DateUtils.STRDATE), DateUtils.STR_DATE) + " 00:00:00";
- String endDate = DateUtils.format(DateUtils.addDays(DateUtils.toDate(date, DateUtils.STRDATE), 1), DateUtils.STR_DATE) + " 00:00:00";
+ String startDate = date + " 00:00:00";
+ String endDate = DateUtils.format(DateUtils.addDays(DateUtils.toDate(date, DateUtils.STR_DATE), 1), DateUtils.STR_DATE) + " 00:00:00";
Integer count = mdcEquipmentRunningSectionService.findAlarmCountByDate(startDate, endDate, vo);
mdcAlarmDto.setCount(count);
dateCountList.add(mdcAlarmDto);
--
Gitblit v1.9.3