From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java
index c6cafdb..daf8877 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java
@@ -1,12 +1,11 @@
package com.panzhihua.common.model.vos.grid.admin.excel;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
/**
* 网格员工作汇总Excel导出
@@ -15,57 +14,57 @@
@ApiModel("网格员工作汇总Excel导出")
public class GridMemberWorkExportExcelVO implements Serializable {
- @ExcelProperty(value = "网格员名称" ,index = 0)
+ @ExcelProperty(value = "网格员名称", index = 0)
private String nickName;
- @ExcelProperty(value = "发布突发事件" ,index = 1)
+ @ExcelProperty(value = "发布突发事件", index = 1)
private Integer addTFTotal;
- @ExcelProperty(value = "处理突发事件" ,index = 2)
+ @ExcelProperty(value = "处理突发事件", index = 2)
private Integer handleTFTotal;
- @ExcelProperty(value = "发布矛盾纠纷" ,index = 3)
+ @ExcelProperty(value = "发布矛盾纠纷", index = 3)
private Integer addMDTotal;
- @ExcelProperty(value = "处理矛盾纠纷" ,index = 4)
+ @ExcelProperty(value = "处理矛盾纠纷", index = 4)
private Integer handleMDTotal;
- @ExcelProperty(value = "发布治安隐患" ,index = 5)
+ @ExcelProperty(value = "发布治安隐患", index = 5)
private Integer addZATotal;
- @ExcelProperty(value = "小区名字" ,index = 6)
+ @ExcelProperty(value = "小区名字", index = 6)
private Integer handleZATotal;
- @ExcelProperty(value = "发布不稳定因素" ,index = 7)
+ @ExcelProperty(value = "发布不稳定因素", index = 7)
private Integer addBWDTotal;
- @ExcelProperty(value = "处理不稳定因素" ,index = 8)
+ @ExcelProperty(value = "处理不稳定因素", index = 8)
private Integer handleBWDTotal;
- @ExcelProperty(value = "发布公共服务" ,index = 9)
+ @ExcelProperty(value = "发布公共服务", index = 9)
private Integer addGGTotal;
- @ExcelProperty(value = "处理公共服务" ,index = 10)
+ @ExcelProperty(value = "处理公共服务", index = 10)
private Integer handleGGTotal;
- @ExcelProperty(value = "发布特殊人群" ,index = 11)
+ @ExcelProperty(value = "发布特殊人群", index = 11)
private Integer addTSTotal;
- @ExcelProperty(value = "处理特殊人群" ,index = 12)
+ @ExcelProperty(value = "处理特殊人群", index = 12)
private Integer handleTSTotal;
- @ExcelProperty(value = "完成走访任务" ,index = 13)
+ @ExcelProperty(value = "完成走访任务", index = 13)
private Integer handleZFTotal;
- @ExcelProperty(value = "处理随手拍" ,index = 14)
+ @ExcelProperty(value = "处理随手拍", index = 14)
private Integer easyPhotoTotal;
- @ExcelProperty(value = "发布宣传教育" ,index = 15)
+ @ExcelProperty(value = "发布宣传教育", index = 15)
private Integer propagandaEducationTotal;
- @ExcelProperty(value = "新增居民数" ,index = 16)
+ @ExcelProperty(value = "新增居民数", index = 16)
private Integer addResidentTotal = 0;
- @ExcelProperty(value = "新增实有房屋数" ,index = 17)
+ @ExcelProperty(value = "新增实有房屋数", index = 17)
private Integer addHouseTotal = 0;
}
--
Gitblit v1.7.1