From 4545af9041b432cbe79214d52be599e4ce8659aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 14 八月 2025 15:55:39 +0800
Subject: [PATCH] 二保结构树代码 维修工单添加 领取按钮 领取后 生成维修开始时间 提交后 生成维修结束时间 计算 维修时长 故障时长 添加导出
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java
index a24c990..938b7a9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java
@@ -80,13 +80,12 @@
*
* @param equipmentId
* @param validDate
- * @param shiftSubId
* @return
*/
@Override
- public BigDecimal findSpindleRunDuration(String equipmentId, String validDate, String shiftSubId) {
+ public BigDecimal findSpindleRunDuration(String equipmentId, String validDate) {
validDate = validDate.replaceAll("-", "");
- BigDecimal duration = this.baseMapper.findSpindleRunDuration(equipmentId, validDate, shiftSubId);
+ BigDecimal duration = this.baseMapper.findSpindleRunDuration(equipmentId, validDate);
if (duration != null && duration.compareTo(BigDecimal.ZERO) != 0) {
return duration.divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP);
} else {
@@ -133,7 +132,7 @@
}
//鏌ヨ鐝埗鐝淇℃伅
Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(equipment.getEquipmentid(), stringDates);
- if (listMap.isEmpty()) {
+ if (listMap == null || listMap.isEmpty()) {
listMap = new HashMap<>();
}
List<MdcEquipmentStatisticalShiftInfo> resultList = new ArrayList<>();
@@ -705,7 +704,7 @@
*/
private Map<String, List<MdcDeviceCalendarVo>> mdcDeviceCalendarMap(String equipmentid, List<String> stringDates) {
List<MdcDeviceCalendarVo> mdcDeviceCalendarVos = mdcDeviceCalendarService.listByEquipmentAndDate(equipmentid, stringDates);
- if (mdcDeviceCalendarVos.isEmpty()) {
+ if (mdcDeviceCalendarVos == null || mdcDeviceCalendarVos.isEmpty()) {
return null;
}
Map<String, List<MdcDeviceCalendarVo>> map = new HashMap<>();
--
Gitblit v1.9.3