From 3351ade035a3a027d38e0372e496a5669cd7bde2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 00:34:42 +0800
Subject: [PATCH] 下发工单bug
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 c33a62c..95fbeb0 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,25 +24,35 @@
* @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 String status;
+ private WorkOrderStatusEnum status;
/** 杩愮淮鍗曚綅 */
private Integer unitId;
+ @Excel(name = "杩愮淮鍗曚綅",sort = 4)
private String unitName;
+ private String unitContact;
+ private String unitContactPhone;
/** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
+ @Excel(name = "璁惧鍚嶇О",sort = 3)
private String source;
/**
* 璁惧缂栧彿
*/
+ @Excel(name = "璁惧缂栧彿",sort = 2)
private String serialNumber;
private Boolean provinceTag;
@@ -54,10 +67,20 @@
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;
/** 杩愮淮澶勭悊鏃堕棿 */
@@ -80,9 +103,15 @@
@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