From f8889f7364adae89e45a5ec3fcf4b38e430cf389 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 九月 2024 10:41:18 +0800
Subject: [PATCH] 工单详情

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 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..be898c3 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,46 +19,55 @@
 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("杩愮淮寮�濮嬫椂闂�")
+    @ExcelProperty("杩愮淮寮�濮嬫椂闂�(瀵煎叆鐣岄潰鍙敼)")
     private Date startTime;
 
-    @ColumnWidth(16)
+    @ColumnWidth(40)
     @DateTimeFormat("yyyy-MM-dd")
-    @ExcelProperty("杩愮淮缁撴潫鏃堕棿")
+    @ExcelProperty("杩愮淮缁撴潫鏃堕棿(瀵煎叆鐣岄潰鍙敼)")
     private Date endTime;
 
     @ExcelIgnore
     private Boolean provinceTag;
 
-    @ExcelProperty("鏄惁鐪佸巺鏍囩")
+    @ColumnWidth(20)
+    @ExcelProperty("鏄惁鐪佸巺鏍囩(鍙慨鏀�)")
     private String provinceTagString;
+
+    @ColumnWidth(20)
+    @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)")
+    private String importantCommandImageTagString;
+
+    @ColumnWidth(20)
+    @ExcelProperty("鏄惁閮ㄧ骇鏍囩(鍙慨鏀�)")
+    private String deptTag;
 
     @ExcelIgnore
     private Boolean importantTag;
 
-    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
-    private String importantTagString;
+//    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
+//    private String importantTagString;
 
     @ExcelIgnore
     private Boolean importantCommandImageTag;
 
-    @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚")
-    private String importantCommandImageTagString;
+
 }

--
Gitblit v1.8.0