From 633b96bb1ced95e60df5e28249ce51b6ffe82d27 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 17:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 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 0c3f2a5..adde7d2 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
@@ -1,9 +1,11 @@
package com.ycl.platform.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
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;
@@ -25,13 +27,42 @@
/** 宸ュ崟鍙� */
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 List<String> errorTypeList;
+ /** 鏁呴殰绫诲瀷 */
+ private String errorType;
/** 杩愮淮浜哄憳 */
private Integer ywPeopleId;
+ private String ywPeopleName;
/** 杩愮淮澶勭悊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime ywHandleTime;
/** 杩愮淮缁撴灉 */
@@ -43,6 +74,21 @@
/** 杩愮淮妫�娴嬬粨鏋� */
private String ywCheckResult;
+ /** 0鏈秴鏃� 1瓒呮椂 */
+ private Integer overtime;
+
+ /** 涓嬪彂鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date distributeTime;
+
+ private Date auditTime;
+ /** 涓嬪彂浜� */
+ 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