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 | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 821a478..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
@@ -31,7 +31,7 @@
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")
+ @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;
@@ -40,7 +40,7 @@
/** 杩愮淮鍗曚綅 */
private Integer unitId;
- @Excel(name = "杩愮淮鍗曚綅",sort = 5)
+ @Excel(name = "杩愮淮鍗曚綅",sort = 6)
private String unitName;
private String unitContact;
private String unitContactPhone;
@@ -49,28 +49,37 @@
@Excel(name = "璁惧鍚嶇О",sort = 3)
private String source;
/** ip */
- @Excel(name = "IP",sort = 4)
+ @Excel(name = "IP",sort = 5)
private String ip;
/**
* 璁惧缂栧彿
*/
@Excel(name = "璁惧缂栧彿",sort = 2)
private String serialNumber;
-
- 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 = "鏁呴殰绫诲瀷")
+ @Excel(name = "鏁呴殰绫诲瀷",sort = 8)
private String errorType;
/** 宸ュ崟妫�娴嬪浘鐗� */
@@ -112,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