From f77a9d8f16bae6b4cf809891f037c038070e81ed Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 17:12:50 +0800
Subject: [PATCH] 工单,数据中心用户查看数据的权限,合同考核每日,以及导出每日和按月

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 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..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
@@ -10,6 +10,7 @@
 import org.springframework.lang.NonNull;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鎶ュ灞曠ず
@@ -28,11 +29,12 @@
 
     /** 杩愮淮浜哄憳ID */
     private Integer peopleId;
-    @Excel(name = "鎶ュ浜哄憳")
     private String peopleName;
 
     /** 璁惧缂栫爜 */
     private String serialNumber;
+
+    private String pointId;
 
     @Excel(name = "鐐逛綅")
     private String pointName;
@@ -46,12 +48,27 @@
     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")
@@ -61,13 +78,15 @@
     /**
      * 鐢熸晥鏃堕棿
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date beginCreateTime;
 
     /**
      * 澶辨晥鏃堕棿
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endCreateTime;
 
     /**
@@ -75,6 +94,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