From e4c69bcd4ba18dd022dd4ed86da96c5e4b8b3150 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 14 十月 2024 02:13:44 +0800
Subject: [PATCH] 动态列导出编辑完成

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 be898c3..6105dfe 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,10 +4,11 @@
 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 com.ycl.platform.domain.vo.DynamicColumnVO;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鐐逛綅瀵煎叆瀵煎嚭
@@ -17,10 +18,9 @@
  */
 @Data
 public class PointExport {
-
+    private Integer id;
     @ColumnWidth(50)
     @ExcelProperty("鐐逛綅鍚嶇О(鍙慨鏀�)")
-
     private String pointName;
 
     @ColumnWidth(30)
@@ -58,16 +58,18 @@
 
     @ColumnWidth(20)
     @ExcelProperty("鏄惁閮ㄧ骇鏍囩(鍙慨鏀�)")
-    private String deptTag;
+    private String deptTagString;
 
+    @ExcelIgnore
+    private Boolean deptTag;
     @ExcelIgnore
     private Boolean importantTag;
 
-//    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
-//    private String importantTagString;
+    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
+    private String importantTagString;
 
     @ExcelIgnore
     private Boolean importantCommandImageTag;
 
-
+    private List<DynamicColumnVO> dynamicData;
 }

--
Gitblit v1.8.0