From 7e39aba8980b95fac3b347689aac66da41079d18 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 22:41:38 +0800
Subject: [PATCH] 报备功能优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 13f523d..ef49b3d 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
@@ -4,16 +4,13 @@
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;
/**
* 鎶ュ灞曠ず
@@ -35,8 +32,11 @@
@Excel(name = "鎶ュ浜哄憳")
private String peopleName;
- /** 鐐逛綅ID */
- private Integer pointId;
+ /** 璁惧缂栫爜 */
+ private String serialNumber;
+
+ private String pointId;
+
@Excel(name = "鐐逛綅")
private String pointName;
@@ -56,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")
@@ -64,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;
/**
--
Gitblit v1.8.0