From 9ca86187d65db0180f6d23b8efd13136b6db394c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 20 九月 2024 11:45:40 +0800
Subject: [PATCH] 考核成绩导出优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 55d2059..dcc4579 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
@@ -7,6 +7,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,28 +23,33 @@
* @since 2024-03-05
*/
@Data
-@Accessors(chain = true)
public class WorkOrderVO extends AbsVo {
/** 宸ュ崟鍙� */
private String workOrderNo;
/** 鐘舵�� */
- private String status;
+ private WorkOrderStatusEnum status;
/** 杩愮淮鍗曚綅 */
private Integer unitId;
private String unitName;
+ private String unitContact;
+ private String unitContactPhone;
- /** 宸ュ崟鏉ユ簮 */
+ /** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
private String source;
/**
- * 鐐逛綅
+ * 璁惧缂栧彿
*/
- private Integer pointId;
+ private String serialNumber;
- private String pointTag;
+ private Boolean provinceTag;
+
+ private Boolean importantTag;
+
+ private Boolean importantCommandImageTag;
/**
* 鏄惁閲嶇偣鐐逛綅
@@ -50,10 +57,19 @@
private Boolean important;
/** 鏁呴殰绫诲瀷 */
+ private List<String> errorTypeList;
+
+ /** 鏁呴殰绫诲瀷 */
private String errorType;
+
+ /** 宸ュ崟妫�娴嬪浘鐗� */
+ private String imgListStr;
+
+ private List<String> imgList;
/** 杩愮淮浜哄憳 */
private Integer ywPeopleId;
+
private String ywPeopleName;
/** 杩愮淮澶勭悊鏃堕棿 */
@@ -76,9 +92,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