From fd837cb1e5b3f5ebfba12c29f32fe34dd4c38669 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 18:38:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 176ea5a..2a5d271 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -14,6 +14,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;
@@ -30,7 +31,6 @@
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
@TableId(value = "wrk_no", type = IdType.INPUT)
- @TableField("wrk_no")
private Integer wrkNo;
@ApiModelProperty(value= "")
@@ -90,6 +90,7 @@
*/
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
@TableField("io_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date ioTime;
/**
@@ -104,6 +105,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
@@ -118,10 +120,12 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
@ApiModelProperty(value= "")
@TableField("error_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date errorTime;
@ApiModelProperty(value= "")
@@ -176,6 +180,13 @@
private String systemMsg;
/**
+ * 涓嬪彂澶辫触娆℃暟
+ */
+ @ApiModelProperty(value= "涓嬪彂澶辫触娆℃暟")
+ @TableField(value = "send_fail_count")
+ private Integer sendFailCount;
+
+ /**
* 鎵规鍙�
*/
@ApiModelProperty(value= "鎵规鍙�")
@@ -195,6 +206,9 @@
if (entity != null) {
return entity.getWrkDesc();
}
+ try {
+ return com.zy.core.enums.WrkStsType.query(this.wrkSts).desc;
+ } catch (Exception ignore) {}
return null;
}
@@ -276,6 +290,10 @@
}
public void setErrorMemo(String errorMemo) {
+ if (errorMemo == null) {
+ this.errorMemo = null;
+ return;
+ }
if (errorMemo.length() > 255) {
errorMemo = errorMemo.substring(0, 150);
}
--
Gitblit v1.9.1