From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 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 bd58844..83a5d7e 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,15 +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 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;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
+
+import java.util.Date;
+import java.util.List;
/**
* 鎶ュ灞曠ず
@@ -23,31 +24,81 @@
/** 杩愮淮鍗曚綅ID */
private Integer unitId;
+ @Excel(name = "杩愮淮鍗曚綅")
private String unitName;
/** 杩愮淮浜哄憳ID */
private Integer peopleId;
private String peopleName;
- /** 鐐逛綅ID */
- private Integer pointId;
+ /** 璁惧缂栫爜 */
+ private String serialNumber;
+
+ private String pointId;
+
+ @Excel(name = "鐐逛綅")
private String pointName;
/** 鎶ュ绫诲瀷 */
+ @Excel(name = "鎶ュ绫诲瀷")
private String reportType;
- /** 瀹℃牳鏃堕棿 */
- private LocalDateTime auditingTime;
-
/** 鎶ュ鍐呭 */
+ @Excel(name = "鎶ュ鍐呭")
private String reportContent;
/** 涓婃姤鏉愭枡 */
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;
+
+ /**
+ * 鐢熸晥鏃堕棿
+ */
+ @Excel(name = "寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date beginCreateTime;
+
+ /**
+ * 澶辨晥鏃堕棿
+ */
+ @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @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