From d715a933d9f599c9586b07a34e076a6c614916b8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 31 十月 2024 02:04:09 +0800
Subject: [PATCH] 点位导出加个区县表头
---
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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..9189529 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,9 +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.ycl.platform.domain.vo.DynamicColumnVO;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鐐逛綅瀵煎叆瀵煎嚭
@@ -16,39 +18,53 @@
*/
@Data
public class PointExport {
-
+ private Integer id;
@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(30)
+ @ExcelProperty("鍖哄幙(涓嶅彲淇敼)")
+ private String area;
@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 deptTagString;
+
+ @ExcelIgnore
+ private Boolean deptTag;
@ExcelIgnore
private Boolean importantTag;
@@ -58,6 +74,5 @@
@ExcelIgnore
private Boolean importantCommandImageTag;
- @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚")
- private String importantCommandImageTagString;
+ private List<DynamicColumnVO> dynamicData;
}
--
Gitblit v1.8.0