From 2626bf3f3fbf7b2daa20089b9ab384f2e27ac831 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 三月 2024 10:38:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ExcelDO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java
similarity index 60%
copy from springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ExcelDO.java
copy to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java
index 699680a..c584c56 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ExcelDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java
@@ -1,11 +1,11 @@
-package com.panzhihua.service_community.model.dos;
+package com.panzhihua.common.model.dtos;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
@Data
-public class ExcelDO {
+public class PartyExcelDO {
@ColumnWidth(10) // 定义列宽
@ExcelProperty(value = {"单位归属"}, index = 0)
@@ -19,19 +19,23 @@
@ExcelProperty(value = {"单位名称"}, index = 2)
private String unitName;
- @ColumnWidth(20) // 定义列宽
- @ExcelProperty(value = {"报道社区名称"}, index = 3)
- private String communityName;
+ @ColumnWidth(26) // 定义列宽
+ @ExcelProperty(value = {"姓名"}, index = 3)
+ private String memberName;
@ColumnWidth(20) // 定义列宽
- @ExcelProperty(value = {"服务次数"}, index = 4)
+ @ExcelProperty(value = {"报道社区名称"}, index = 4)
+ private String belongCommunity;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"服务次数"}, index = 5)
private Integer serviceTimes;
@ColumnWidth(20) // 定义列宽
- @ExcelProperty(value = {"服务时长"}, index = 5)
+ @ExcelProperty(value = {"服务时长"}, index = 6)
private Integer serviceTime;
@ColumnWidth(20) // 定义列宽
- @ExcelProperty(value = {"累计积分"}, index = 6)
- private Long awardSum;
+ @ExcelProperty(value = {"累计积分"}, index = 7)
+ private Long partyCount;
}
--
Gitblit v1.7.1