From 1ffc844e3483cd3ac7cc73b5fb17c62e09d1ff2f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 10:54:34 +0800
Subject: [PATCH] 工单取图像查询工单范围调整、分页图片查询

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
index d9b1ac5..0fac11f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
@@ -4,6 +4,7 @@
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import lombok.Data;
 
 import java.util.Date;
@@ -18,27 +19,28 @@
 public class PointExport {
 
     @ColumnWidth(50)
-    @ExcelProperty("鐐逛綅鍚嶇О")
+    @ExcelProperty("鐐逛綅鍚嶇О(鍙慨鏀�)")
+
     private String pointName;
 
     @ColumnWidth(30)
-    @ExcelProperty("鍥芥爣鐮�")
+    @ExcelProperty("鍥芥爣鐮�(涓嶅彲淇敼)")
     private String serialNumber;
 
-    @ColumnWidth(16)
-    @ExcelProperty("鐐逛綅IP")
+    @ColumnWidth(30)
+    @ExcelProperty("鐐逛綅IP(鍙慨鏀�)")
     private String pointIP;
 
     @ColumnWidth(40)
-    @ExcelProperty("褰撳墠杩愮淮鍗曚綅")
+    @ExcelProperty("褰撳墠杩愮淮鍗曚綅(瀵煎叆鐣岄潰鍙敼)")
     private String unitName;
 
-    @ColumnWidth(16)
+    @ColumnWidth(40)
     @DateTimeFormat("yyyy-MM-dd")
     @ExcelProperty("杩愮淮寮�濮嬫椂闂�")
     private Date startTime;
 
-    @ColumnWidth(16)
+    @ColumnWidth(40)
     @DateTimeFormat("yyyy-MM-dd")
     @ExcelProperty("杩愮淮缁撴潫鏃堕棿")
     private Date endTime;
@@ -46,18 +48,20 @@
     @ExcelIgnore
     private Boolean provinceTag;
 
-    @ExcelProperty("鏄惁鐪佸巺鏍囩")
+    @ColumnWidth(20)
+    @ExcelProperty("鏄惁鐪佸巺鏍囩(鍙慨鏀�)")
     private String provinceTagString;
 
     @ExcelIgnore
     private Boolean importantTag;
 
-    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
-    private String importantTagString;
+//    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
+//    private String importantTagString;
 
     @ExcelIgnore
     private Boolean importantCommandImageTag;
 
-    @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚")
+    @ColumnWidth(20)
+    @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)")
     private String importantCommandImageTagString;
 }

--
Gitblit v1.8.0