From b7eab0dfd01f691efa10980aebc872fa872cb8ea Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期三, 30 七月 2025 14:50:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java index cf5ee86..dccc948 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java @@ -1,6 +1,9 @@ package org.jeecg.modules.eam.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.jeecg.modules.mdc.util.DateUtils; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -30,6 +33,8 @@ /** * 鏁呴殰寮�濮嬫椂闂� */ + @JsonFormat(timezone = "GMT+8",pattern = "yy-MM-dd HH:mm") + @DateTimeFormat(pattern="yy-MM-dd HH:mm") private Date faultStartTime; /** * 缁翠慨浜� @@ -38,6 +43,8 @@ /** * 鎺ュ崟鏃堕棿 */ + @JsonFormat(timezone = "GMT+8",pattern = "yy-MM-dd HH:mm") + @DateTimeFormat(pattern="yy-MM-dd HH:mm") private Date repairStartTime; /** * 鏁呴殰鎸佺画鏃堕暱(MIN) @@ -47,4 +54,12 @@ * 宸ュ崟鐘舵�� */ private String reportStatus; + + //璁$畻 鏁呴殰鎸佺画鏃堕暱 鍒嗛挓 + public Integer getFaultDuration() { + if (faultStartTime != null) { + return DateUtils.differentMinutes(faultStartTime, new Date()); + } + return null; + } } -- Gitblit v1.9.3