From 62f550fb86a3855bb74bc99e98902da5483768d5 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 14 七月 2023 14:49:28 +0800
Subject: [PATCH] 非计划停机维护功能update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
index 69ffb27..45772bc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
@@ -54,17 +54,17 @@
/**
* 闈炶鍒掑仠鏈哄紑濮嬫椂闂�
*/
- @Excel(name = "闈炶鍒掑仠鏈哄紑濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "闈炶鍒掑仠鏈哄紑濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "闈炶鍒掑仠鏈哄紑濮嬫椂闂�")
private Date startTime;
/**
* 闈炶鍒掑仠鏈虹粨鏉熸椂闂�
*/
- @Excel(name = "闈炶鍒掑仠鏈虹粨鏉熸椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "闈炶鍒掑仠鏈虹粨鏉熸椂闂�", width = 20, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "闈炶鍒掑仠鏈虹粨鏉熸椂闂�")
private Date endTime;
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java
index bcee671..f2b6262 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java
@@ -86,8 +86,8 @@
List<MdcNoplanClose> mdcNoplanCloseList = new ArrayList<>();
a:
for (String equipmentId : equipmentIds) {
- Date startTime = DateUtils.getFormatDate(mdcNoplanCloseVo.getStartTime(), DateUtils.STR_DATE_TIME_SMALL);
- Date endTime = DateUtils.getFormatDate(mdcNoplanCloseVo.getEndTime(), DateUtils.STR_DATE_TIME_SMALL);
+ Date startTime = DateUtils.getFormatDate(mdcNoplanCloseVo.getStartTime(), DateUtils.STR_DATE_TIME_MIN);
+ Date endTime = DateUtils.getFormatDate(mdcNoplanCloseVo.getEndTime(), DateUtils.STR_DATE_TIME_MIN);
MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
LambdaQueryWrapper<MdcNoplanClose> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MdcNoplanClose::getEquipmentId, equipmentId);
--
Gitblit v1.9.3