From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index 07ca702..0f1824c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -5,6 +5,7 @@
import com.ycl.platform.domain.entity.WorkOrder;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
@@ -26,12 +27,31 @@
/** 宸ュ崟鍙� */
private String workOrderNo;
+ /** 鐘舵�� */
+ private String status;
+
/** 杩愮淮鍗曚綅 */
private Integer unitId;
private String unitName;
- /** 宸ュ崟鏉ユ簮 */
+ /** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
private String source;
+
+ /**
+ * 璁惧缂栧彿
+ */
+ private String serialNumber;
+
+ private Boolean provinceTag;
+
+ private Boolean importantTag;
+
+ private Boolean importantCommandImageTag;
+
+ /**
+ * 鏄惁閲嶇偣鐐逛綅
+ */
+ private Boolean important;
/** 鏁呴殰绫诲瀷 */
private String errorType;
@@ -53,6 +73,20 @@
/** 杩愮淮妫�娴嬬粨鏋� */
private String ywCheckResult;
+ /** 0鏈秴鏃� 1瓒呮椂 */
+ private Integer overtime;
+
+ /** 涓嬪彂鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date distributeTime;
+
+ /** 涓嬪彂浜� */
+ private String realName;
+
+ /**
+ * 鏄惁鎵ｈ繃绉垎
+ */
+ private Boolean deduct;
public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
if(vo == null) {
vo = new WorkOrderVO();
--
Gitblit v1.8.0