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 | 12 ++++++++++++
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 8 +++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 6 ++++--
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index b704de3..bb23cb0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -104,7 +104,8 @@
MdcEquipment mdcEquipment = new MdcEquipment();
mdcEquipment.setEquipmentId(entity.getEquipmentCode());
mdcEquipment.setEquipmentType(entity.getDeviceType());
- mdcEquipment.setEquipmentName(entity.getEquipmentName());
+ mdcEquipment.setEquipmentName(entity.getInstallationPosition());
+ mdcEquipment.setEquipmentAddress(entity.getEquipmentName());
mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
return Result.OK("娣诲姞鎴愬姛锛�");
@@ -275,7 +276,8 @@
MdcEquipment mdcEquipment = new MdcEquipment();
mdcEquipment.setEquipmentId(eamEquipment.getEquipmentCode());
mdcEquipment.setEquipmentType(eamEquipment.getDeviceType());
- mdcEquipment.setEquipmentName(eamEquipment.getEquipmentName());
+ mdcEquipment.setEquipmentName(eamEquipment.getInstallationPosition());
+ mdcEquipment.setEquipmentAddress(eamEquipment.getEquipmentName());
mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
}
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 543ad28..adfccae 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -33,11 +33,17 @@
@ApiModelProperty(value = "璁惧缂栫爜")
private String equipmentId;
/**
+ * 瀹夎浣嶇疆
+ */
+ @Excel(name = "瀹夎浣嶇疆", width = 15)
+ @ApiModelProperty(value = "瀹夎浣嶇疆")
+ private String equipmentName;
+ /**
* 璁惧鍚嶇О
*/
@Excel(name = "璁惧鍚嶇О", width = 15)
@ApiModelProperty(value = "璁惧鍚嶇О")
- private String equipmentName;
+ private String equipmentAddress;
/**
* 璁惧鍨嬪彿
*/
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 efbad37..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));
--
Gitblit v1.9.3