From af69f416ff531ea7fd7a22e02885bf9d78536f41 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 05 七月 2024 08:38:31 +0800
Subject: [PATCH] add plan
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index 8f4f11a..1e78c77 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -2,14 +2,16 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
+import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import jakarta.validation.constraints.NotNull;
import lombok.*;
-
-
import java.util.Date;
+import java.util.List;
/**
* 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
@@ -34,36 +36,61 @@
@NotNull(message="[鐢ㄦ埛瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long userId;
+
+ @TableField(exist = false)
+ public String userName;
/**
* 鐢熶骇绾垮疄浣撶紪鍙�
*/
@NotNull(message="[鐢熶骇绾垮疄浣撶紪鍙穄涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long lineId;
+
+ @TableField(exist = false)
+ public String lineName;
/**
* 宸ョ珯瀹炰綋缂栧彿
*/
@NotNull(message="[宸ョ珯瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long stationId;
+
+ @TableField(exist = false)
+ public String stationName;
+
/**
* 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
*/
@NotNull(message="[缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long planId;
+
+ @TableField(exist = false)
+ public String planName;
+
/**
* 鐢熶骇娴佺▼瀹炰綋缂栧彿
*/
@NotNull(message="[鐢熶骇娴佺▼瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long processId;
+
+ @TableField(exist = false)
+ public String processName;
/**
* 鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿
*/
@NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long nodeId;
+
+ @TableField(exist = false)
+ public String nodeName;
+
+ public Integer nodeType;
+
+ @TableField(exist = false)
+ public PrAssemblyPlan plan;
/**
* 浠诲姟璁ら鏃堕棿
*/
@@ -85,5 +112,8 @@
*/
public String assistants;
+ @TableField(exist = false)
+ public List<BaUser> assistantsList;
+
}
--
Gitblit v1.8.0