From d4e4029d2d6117404561e824bd602cbf82588972 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 06 五月 2025 14:47:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
index e4d09d2..a97966b 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
@@ -122,12 +122,22 @@
@Excel(name = "鍒犻櫎鏍囧織", readConverterExp = "0=浠ｈ〃瀛樺湪,2=浠ｈ〃鍒犻櫎")
private String delFlag;
+ /** 浣滀笟 */
+ @Excel(name = "浣滀笟")
+ private String stdOp;
-
-
-
-
+ /** 璐﹀缂栫爜 */
private String orgCode;
+
+ /** 褰撳墠宸ュ簭鐘舵�� */
+ @JsonProperty("OpStatus")
+ @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+ private String opStatus;
+
+ /** 涓嬩竴宸ュ簭鍚嶇О */
+ @JsonProperty("NextOpName")
+ @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+ private String nextOpName;
public void setId(Long id)
{
@@ -406,6 +416,30 @@
this.orgCode = orgCode;
}
+ public void setStdOp(String stdOp) {
+ this.stdOp = stdOp;
+ }
+
+ public String getStdOp() {
+ return stdOp;
+ }
+
+ public String getOpStatus() {
+ return opStatus;
+ }
+
+ public void setOpStatus(String opStatus) {
+ this.opStatus = opStatus;
+ }
+
+ public String getNextOpName() {
+ return nextOpName;
+ }
+
+ public void setNextOpName(String nextOpName) {
+ this.nextOpName = nextOpName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -440,6 +474,9 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("processStatus", getProcessStatus())
+ .append("stdOp", getStdOp())
+ .append("opStatus", getOpStatus())
+ .append("nextOpName", getNextOpName())
.toString();
}
}
--
Gitblit v1.9.3