From e8f24fe86ec48d7e4cd0179fa8cdaa464526d562 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:21:56 +0800
Subject: [PATCH] 自动化产线集成写库取消
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 b1051a3..3d82327 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
@@ -99,9 +99,16 @@
return this.baseMapper.findByEquipmentAndMonth(equipmentId, date);
}
+ @Override
+ public List<MdcEquipmentStatisticalDto> findShiftByEquipmentAndMonth(String equipmentId, String date) {
+ return this.baseMapper.findShiftByEquipmentAndMonth(equipmentId, date);
+ }
+
@Transactional(readOnly = true)
public List<MdcEquipmentStatisticalShiftInfo> equipmentShiftStatisticalProcess(Equipment equipment, String dateTime) {
Date initDate = null;
+ List<String> stringDates = new ArrayList<>();
+ Date endDate = DateUtils.plusTime(DateUtils.getNow(), 0);
//鍙栨渶鍚庣殑缁熻鏁版嵁
if (StringUtils.isBlank(dateTime)) {
MdcEquipmentStatisticalShiftInfo nearestDate = this.baseMapper.getMaxStaticsData(equipment.getEquipmentid());
@@ -115,6 +122,17 @@
initDate = equipmentRunningSection.getStartTime();
}
}
+ if (initDate == null) {
+ return null;
+ }
+ if (!DateUtils.less(initDate, endDate)) {
+ return Collections.emptyList();
+ }
+ //鑾峰彇涓や釜鏃堕棿娈电殑宸�
+ stringDates = DateUtils.getDatesStringList2(initDate, DateUtils.plusTime(endDate, -1));
+ if (stringDates.isEmpty()) {
+ return Collections.emptyList();
+ }
} else {
try {
initDate = DateUtils.toDate(dateTime, "yyyyMMdd");
@@ -123,18 +141,13 @@
log.error("鍙傛暟鏍煎紡涓嶅", null);
return null;
}
- }
- if (initDate == null) {
- return null;
- }
- Date endDate = DateUtils.plusTime(DateUtils.getNow(), 0);
- if (!DateUtils.less(initDate, endDate)) {
- return Collections.emptyList();
- }
- //鑾峰彇涓や釜鏃堕棿娈电殑宸�
- List<String> stringDates = DateUtils.getDatesStringList2(initDate, DateUtils.plusTime(endDate, -1));
- if (stringDates.isEmpty()) {
- return Collections.emptyList();
+ if (initDate == null) {
+ return null;
+ }
+ if (!DateUtils.less(initDate, endDate)) {
+ return Collections.emptyList();
+ }
+ stringDates.add(DateUtils.format(initDate, DateUtils.STRDATE));
}
//鏌ヨ鐝埗鐝淇℃伅
Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(equipment.getEquipmentid(), stringDates);
--
Gitblit v1.9.3