From e23edcf2619ad46fd77a710fca6c21de78234bc0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 07 一月 2025 17:33:06 +0800
Subject: [PATCH] 核算重构完成
---
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 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..83ca88e 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)
@@ -30,6 +30,9 @@
@ColumnWidth(30)
@ExcelProperty("鐐逛綅IP(鍙慨鏀�)")
private String pointIP;
+ @ColumnWidth(30)
+ @ExcelProperty("鍖哄幙(涓嶅彲淇敼)")
+ private String area;
@ColumnWidth(40)
@ExcelProperty("褰撳墠杩愮淮鍗曚綅(瀵煎叆鐣岄潰鍙敼)")
@@ -46,28 +49,43 @@
private Date endTime;
@ExcelIgnore
- private Boolean provinceTag;
+ private Boolean provinceTagVideo;
+
+ @ExcelIgnore
+ private Boolean provinceTagCar;
+
+ @ExcelIgnore
+ private Boolean provinceTagFace;
@ColumnWidth(20)
- @ExcelProperty("鏄惁鐪佸巺鏍囩(鍙慨鏀�)")
- private String provinceTagString;
+ @ExcelProperty("鏄惁鐪佸巺瑙嗛鏍囩(鍙慨鏀�)")
+ private String provinceTagVideoString;
+ @ColumnWidth(20)
+ @ExcelProperty("鏄惁鐪佸巺杞﹁締鏍囩(鍙慨鏀�)")
+ private String provinceTagCarString;
+
+ @ColumnWidth(20)
+ @ExcelProperty("鏄惁鐪佸巺浜鸿劯鏍囩(鍙慨鏀�)")
+ private String provinceTagFaceString;
@ColumnWidth(20)
@ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)")
private String importantCommandImageTagString;
@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