From 84d1db0005eb9567810e1229636357d2a994d944 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 10:34:48 +0800
Subject: [PATCH] 报备功能优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 1be1ae5..af41d18 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
@@ -10,6 +10,7 @@
import org.springframework.lang.NonNull;
import java.util.Date;
+import java.util.List;
/**
* 鎶ュ灞曠ず
@@ -34,6 +35,8 @@
/** 璁惧缂栫爜 */
private String serialNumber;
+ private String pointId;
+
@Excel(name = "鐐逛綅")
private String pointName;
@@ -53,6 +56,18 @@
@Excel(name = "鏁呴殰绫诲瀷")
private String errorType;
+ private List<String> errorTypeList;
+
+ /**
+ * 瀹℃牳缁撴灉
+ */
+ private Boolean result;
+
+ /**
+ * 瀹℃牳鎰忚
+ */
+ private String resultRemark;
+
/** 瀹℃牳鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
@@ -61,13 +76,13 @@
/**
* 鐢熸晥鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginCreateTime;
/**
* 澶辨晥鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endCreateTime;
/**
@@ -75,6 +90,11 @@
*/
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