From db75b45e9a7ce347162b8d3a36e4a7f46cfe199e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 10 二月 2025 15:30:18 +0800
Subject: [PATCH] 核算导出单独对录像扣分的数量做处理

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java |   95 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 93 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 0c3f2a5..597277b 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,10 +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;
@@ -19,19 +24,83 @@
  * @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 WorkOrderStatusEnum status;
 
     /** 杩愮淮鍗曚綅 */
     private Integer unitId;
+    @Excel(name = "杩愮淮鍗曚綅",sort = 6)
+    private String unitName;
+    private String unitContact;
+    private String unitContactPhone;
+
+    /** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
+    @Excel(name = "璁惧鍚嶇О",sort = 3,width = 25)
+    private String source;
+    /** ip */
+    @Excel(name = "IP",sort = 5)
+    private String ip;
+    /**
+     * 璁惧缂栧彿
+     */
+    @Excel(name = "璁惧缂栧彿",sort = 2,width = 22)
+    private String serialNumber;
+    /**
+     * 鑰冩牳鏍囩
+     * @param entity
+     * @param vo
+     * @return
+     */
+    @Excel(name = "鑰冩牳鏍囩",sort = 4)
+    private String tag;
+
+    /**
+     * 鏄惁閲嶇偣鐐逛綅
+     */
+    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;
+    /**
+     * 璁惧鏍囩
+     * @param entity
+     * @param vo
+     * @return
+     */
+    @Excel(name = "璁惧鏍囩",sort = 9,width = 30)
+    private String dynamicTag;
+    /** 宸ュ崟妫�娴嬪浘鐗� */
+    private String imgListStr;
+
+    private List<String> imgList;
 
     /** 杩愮淮浜哄憳 */
     private Integer ywPeopleId;
+    private Long pointId;
+    private String ywPeopleName;
 
     /** 杩愮淮澶勭悊鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime ywHandleTime;
 
     /** 杩愮淮缁撴灉 */
@@ -43,6 +112,28 @@
     /** 杩愮淮妫�娴嬬粨鏋� */
     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;
+    //澶勭悊鏃堕棿鐐归泦鍚�
+    private List<Date> handleTimeList;
+    private Date handleTime;
+    //瀹℃牳鏃堕棿鐐归泦鍚�
+    private List<Date> auditTimeList;
+    private Date auditTime;
+
+
     public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
         if(vo == null) {
             vo = new WorkOrderVO();

--
Gitblit v1.8.0