From e61e2780013d4650a277245965b80a32e8e5cc6d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 16:24:51 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index d6e5402..e542a25 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -11,6 +11,7 @@
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -270,8 +271,8 @@
private String manuType;
@ApiModelProperty(value= "")
- @TableField("memo_m")
- private String memoM;
+ @TableField("memo")
+ private String memo;
@ApiModelProperty(value= "")
@TableField("sc_weight")
@@ -323,6 +324,14 @@
@ApiModelProperty(value= "鍥涘悜绌挎杞�")
@TableField("shuttle_no")
private Integer shuttleNo;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
public WrkMastLog() {}
@@ -501,6 +510,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
/**
* 鑾峰彇鎸佺画鏃堕棿
*/
@@ -510,6 +526,9 @@
}
Date endDate = new Date();
+ if (!Cools.isEmpty(this.endTime)) {
+ endDate = this.endTime;
+ }
//鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
long l = this.ioTime.getTime() - endDate.getTime();
--
Gitblit v1.9.1