From 4c50c77f3a5cf63746068d4a703e65792701bc09 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 30 五月 2025 16:42:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 be8d111..02efd34 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
@@ -287,6 +287,18 @@
errorLong += du;
}
}
+
+ //濡傚緟鏈烘椂闂�+鍔犲伐鏃堕棿+鍏虫満鏃堕棿涓嶇瓑浜�86400锛岄渶灏嗗浣欐椂闂磋繘琛岃ˉ鍏�
+ long remainingDate = 86400 - waitingLong - processingLong - closedLong;
+ if (remainingDate != 0L) {
+ //濡傛灉鍏虫満鏃堕棿澶т簬寰呮満鏃堕棿+鍔犲伐鏃堕棿锛屽皢澶氫綑鏃堕棿鍔犺嚦鍏虫満鏃堕棿锛屽惁鍒欙紝鍔犲叆寰呮満鏃堕棿
+ if (waitingLong + processingLong < closedLong) {
+ closedLong += remainingDate;
+ }else {
+ waitingLong += remainingDate;
+ }
+ }
+
equipmentStatisticalInfo.setWaitLong(new BigDecimal(waitingLong));
equipmentStatisticalInfo.setProcessLong(new BigDecimal(processingLong));
equipmentStatisticalInfo.setCloseLong(new BigDecimal(closedLong));
@@ -325,13 +337,13 @@
}
@Override
- public MdcEquipmentStatisticalInfo findByEquipmentAndDate(List<String> equipmentList, String date) {
- return this.baseMapper.findByEquipmentAndDate(equipmentList, date);
+ public List<MdcEquipmentStatisticalInfo> findByEquipmentAndDate(List<String> equipmentList, String start, String end) {
+ return this.baseMapper.findByEquipmentAndDate(equipmentList, start, end);
}
@Override
- public MdcEquipmentStatisticalInfo findByEquIdAndDate(String equipmentId, String date) {
- return this.baseMapper.findByEquIdAndDate(equipmentId, date);
+ public List<MdcEquipmentStatisticalInfo> findByEquIdAndDate(String equipmentId, String start, String end) {
+ return this.baseMapper.findByEquIdAndDate(equipmentId, start, end);
}
@Override
--
Gitblit v1.9.3