From 85874be1abe13d027b85a4c7ad0c341c39c4ff31 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 12 三月 2025 16:00:07 +0800
Subject: [PATCH] 停机原因维护和上报功能bug
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/ScanDowntimeJob.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java | 4 ----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
index 88eebae..e08812a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
@@ -48,7 +48,7 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private Date startTime;
+ private Date startDate;
/**
* 缁撴潫鏃堕棿
*/
@@ -56,7 +56,7 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private Date endTime;
+ private Date endDate;
/**
* 鍋滄満鍘熷洜id
*/
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/ScanDowntimeJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/ScanDowntimeJob.java
index 84d9da1..eafa8fc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/ScanDowntimeJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/ScanDowntimeJob.java
@@ -88,8 +88,8 @@
downtime.setEquipmentId(mdcEquipmentWaitSectionDto.getEquipmentId());
downtime.setEquipmentName(mdcEquipmentWaitSectionDto.getEquipmentName());
downtime.setTheDate(finalDate);
- downtime.setStartTime(mdcEquipmentWaitSectionDto.getStartTime());
- downtime.setEndTime(mdcEquipmentWaitSectionDto.getEndTime());
+ downtime.setStartDate(mdcEquipmentWaitSectionDto.getStartTime());
+ downtime.setEndDate(mdcEquipmentWaitSectionDto.getEndTime());
return downtime;
}).collect(Collectors.toList());
if (!downtimeList.isEmpty()) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java
index cd87368..97cc304 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDowntimeVo.java
@@ -29,10 +29,6 @@
* 灞傜骇ID
*/
private String parentId;
- /**
- * 璁惧Id
- */
- private String equipmentId;
/**
* 璁惧ids
--
Gitblit v1.9.3