From 3364d6efd58eca1d6acf129948265b1e663dae7a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 bd58844..13f523d 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,7 +1,11 @@
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 java.util.Date;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
@@ -23,31 +27,57 @@
/** 杩愮淮鍗曚綅ID */
private Integer unitId;
+ @Excel(name = "杩愮淮鍗曚綅")
private String unitName;
/** 杩愮淮浜哄憳ID */
private Integer peopleId;
+ @Excel(name = "鎶ュ浜哄憳")
private String peopleName;
/** 鐐逛綅ID */
private Integer pointId;
+ @Excel(name = "鐐逛綅")
private String pointName;
/** 鎶ュ绫诲瀷 */
+ @Excel(name = "鎶ュ绫诲瀷")
private String reportType;
- /** 瀹℃牳鏃堕棿 */
- private LocalDateTime auditingTime;
-
/** 鎶ュ鍐呭 */
+ @Excel(name = "鎶ュ鍐呭")
private String reportContent;
/** 涓婃姤鏉愭枡 */
+ @Excel(name = "涓婃姤鏉愭枡")
private String reportMaterials;
/** 鏁呴殰绫诲瀷 */
+ @Excel(name = "鏁呴殰绫诲瀷")
private String errorType;
+ /** 瀹℃牳鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date auditingTime;
+
+ /**
+ * 鐢熸晥鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date beginCreateTime;
+
+ /**
+ * 澶辨晥鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endCreateTime;
+
+ /**
+ * 鐘舵��
+ */
+ private Integer status;
+
public static ReportVO getVoByEntity(@NonNull Report entity, ReportVO vo) {
if(vo == null) {
vo = new ReportVO();
--
Gitblit v1.8.0