From f6593a5f6f1138abf09a0ee69fc5119fdce412c9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 07 十二月 2024 17:52:07 +0800
Subject: [PATCH] 标签bug

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 2 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 83fc829..821a478 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,11 +1,15 @@
 package com.ycl.platform.domain.vo;
 
+import annotation.Excel;
 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 enumeration.general.WorkOrderStatusEnum;
 import org.springframework.lang.NonNull;
 import org.springframework.beans.BeanUtils;
 import io.swagger.annotations.ApiModel;
@@ -20,18 +24,63 @@
  * @since 2024-03-05
  */
 @Data
-@Accessors(chain = true)
-public class WorkOrderVO extends AbsVo {
+public class WorkOrderVO{
 
     /** 宸ュ崟鍙� */
+    @Excel(name = "宸ュ崟鍙�",sort = 1)
     private String workOrderNo;
+    private Integer id;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鏁呴殰鏃堕棿",sort = 6,dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /** 鐘舵�� */
+    private WorkOrderStatusEnum status;
 
     /** 杩愮淮鍗曚綅 */
     private Integer unitId;
+    @Excel(name = "杩愮淮鍗曚綅",sort = 5)
     private String unitName;
+    private String unitContact;
+    private String unitContactPhone;
+
+    /** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
+    @Excel(name = "璁惧鍚嶇О",sort = 3)
+    private String source;
+    /** ip */
+    @Excel(name = "IP",sort = 4)
+    private String ip;
+    /**
+     * 璁惧缂栧彿
+     */
+    @Excel(name = "璁惧缂栧彿",sort = 2)
+    private String serialNumber;
+
+    private Boolean importantTag;
+
+    private Boolean importantCommandImageTag;
+
+    /**
+     * 鏄惁閲嶇偣鐐逛綅
+     */
+    private Boolean important;
+
+    /** 鏁呴殰绫诲瀷 */
+    private List<String> errorTypeList;
+
+    /** 鏁呴殰绫诲瀷 */
+    @Excel(name = "鏁呴殰绫诲瀷")
+    private String errorType;
+
+    /** 宸ュ崟妫�娴嬪浘鐗� */
+    private String imgListStr;
+
+    private List<String> imgList;
 
     /** 杩愮淮浜哄憳 */
     private Integer ywPeopleId;
+
     private String ywPeopleName;
 
     /** 杩愮淮澶勭悊鏃堕棿 */
@@ -47,6 +96,22 @@
     /** 杩愮淮妫�娴嬬粨鏋� */
     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