From 7b73755e320f1bec9254b86a0f078c5f7969880d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 19 十二月 2024 10:06:47 +0800
Subject: [PATCH] 接入海康成绩
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 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 6cb4ec5..0db8edb 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,5 +1,6 @@
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;
@@ -7,6 +8,8 @@
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;
@@ -21,42 +24,62 @@
* @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 = 7,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
/** 鐘舵�� */
- private String status;
+ private WorkOrderStatusEnum status;
/** 杩愮淮鍗曚綅 */
private Integer unitId;
+ @Excel(name = "杩愮淮鍗曚綅",sort = 6)
private String unitName;
+ private String unitContact;
+ private String unitContactPhone;
/** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
+ @Excel(name = "璁惧鍚嶇О",sort = 3)
private String source;
-
+ /** ip */
+ @Excel(name = "IP",sort = 5)
+ private String ip;
/**
* 璁惧缂栧彿
*/
+ @Excel(name = "璁惧缂栧彿",sort = 2)
private String serialNumber;
-
- private Boolean provinceTag;
-
- private Boolean importantTag;
-
- private Boolean importantCommandImageTag;
+ /**
+ * 鏍囩
+ * @param entity
+ * @param vo
+ * @return
+ */
+ @Excel(name = "鏍囩",sort = 4)
+ private String tag;
/**
* 鏄惁閲嶇偣鐐逛綅
*/
- private Boolean important;
+ private Boolean importantTag;
+ private Boolean importantCommandImageTag;
+ private Boolean deptTag;
+ private Boolean provinceTagVideo;
+ private Boolean provinceTagCar;
+ private Boolean provinceTagFace;
/** 鏁呴殰绫诲瀷 */
private List<String> errorTypeList;
/** 鏁呴殰绫诲瀷 */
+ @Excel(name = "鏁呴殰绫诲瀷",sort = 8)
private String errorType;
/** 宸ュ崟妫�娴嬪浘鐗� */
@@ -98,6 +121,7 @@
*/
private Boolean deduct;
+
public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
if(vo == null) {
vo = new WorkOrderVO();
--
Gitblit v1.8.0