From 99f9e444c3dff89297a1519b49f837c9512dfcec Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 26 二月 2025 11:39:33 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
index d63b055..828202f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcEquipmentStatisticalInfoMapper;
@@ -142,7 +143,12 @@
endDate = DateUtils.setTimeForDay(DateUtils.plusTime(now, -1), planTime);
}
List<MdcEquipmentRunningSection> equipmentRunningSectionList = mdcEquipmentRunningSectionService.listForEquipmentStatisticalInfo(equipment.getEquipmentid(), startDate, endDate);
- return this.statisticsData(equipmentRunningSectionList, planTime, startDate, endDate, equipment);
+ try {
+ return this.statisticsData(equipmentRunningSectionList, planTime, startDate, endDate, equipment);
+ } catch (Exception e) {
+ throw new JeecgBootException("璁惧缂栧彿锛�" + equipment.getEquipmentid());
+ }
+
} else {
//寰呴獙璇�
Date end = DateUtils.plusTime(initDate, 1);
@@ -274,20 +280,22 @@
long processingLong = 0L;
long closedLong = 0L;
long errorLong = 0L;
- for (Map<String, Long> n : dayList) {
- long du = n.get("duration");
- int status = new Long(n.get("status")).intValue();
- if (status == 2) {
- waitingLong += du;
- }
- if (status == 3) {
- processingLong += du;
- }
- if (status == 0) {
- closedLong += du;
- }
- if (status == 22) {
- errorLong += du;
+ if (dayList != null && !dayList.isEmpty()) {
+ for (Map<String, Long> n : dayList) {
+ long du = n.get("duration");
+ int status = new Long(n.get("status")).intValue();
+ if (status == 2) {
+ waitingLong += du;
+ }
+ if (status == 3) {
+ processingLong += du;
+ }
+ if (status == 0) {
+ closedLong += du;
+ }
+ if (status == 22) {
+ errorLong += du;
+ }
}
}
equipmentStatisticalInfo.setWaitLong(new BigDecimal(waitingLong));
--
Gitblit v1.9.3