From 848e5624f3a814763e81db5d79d8f0761c5bb4f1 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 01 二月 2024 10:25:40 +0800
Subject: [PATCH] 设备管理按照车间筛选和导出
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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..0b5c5b2 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<>();
--
Gitblit v1.9.3