From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
index b4e0715..a233dea 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
@@ -1,18 +1,16 @@
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.Report;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
import java.util.Date;
import java.util.List;
-import java.time.LocalDateTime;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 鎶ュ灞曠ず
@@ -31,11 +29,13 @@
/** 杩愮淮浜哄憳ID */
private Integer peopleId;
- @Excel(name = "鎶ュ浜哄憳")
private String peopleName;
- /** 鐐逛綅ID */
- private Integer pointId;
+ /** 璁惧缂栫爜 */
+ private String serialNumber;
+
+ private String pointId;
+
@Excel(name = "鐐逛綅")
private String pointName;
@@ -48,32 +48,55 @@
private String reportContent;
/** 涓婃姤鏉愭枡 */
- @Excel(name = "涓婃姤鏉愭枡")
private String reportMaterials;
/** 鏁呴殰绫诲瀷 */
@Excel(name = "鏁呴殰绫诲瀷")
private String errorType;
+ private List<String> errorTypeList;
+
+ /**
+ * 瀹℃牳缁撴灉
+ */
+ private Boolean result;
+
+ @Excel(name = "瀹℃牳鐘舵��")
+ private String resultStr;
+
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @Excel(name = "瀹℃牳鎰忚")
+ private String resultRemark;
+
/** 瀹℃牳鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditingTime;
/**
* 鐢熸晥鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginCreateTime;
/**
* 澶辨晥鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endCreateTime;
/**
- * 瑁呭～
+ * 鐘舵��
*/
private Integer status;
+ /**
+ * 鎵归噺瀵煎叆鎵规鍙�
+ */
+ private String importBatchNumber;
+
public static ReportVO getVoByEntity(@NonNull Report entity, ReportVO vo) {
if(vo == null) {
vo = new ReportVO();
--
Gitblit v1.8.0