From b424d6493efb60cb8d93a2e16526086da1fc2ea9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 16:08:11 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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..9d83c7a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -11,13 +11,14 @@
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;
import java.util.Date;
@Data
-@TableName("asr_wrk_mast_log")
+@TableName("\"SOURCE\".\"asr_wrk_mast_log\"")
public class WrkMastLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -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