From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
index c76a2b2..75963ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
@@ -1,11 +1,11 @@
package com.panzhihua.common.model.vos.community;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
-
import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
/**
* @description: 批量导出隐患报告台账管理
@@ -17,43 +17,72 @@
/**
* 小区名称
*/
- @ExcelProperty(value = "安全隐患地址" ,index = 0)
+ @ExcelProperty(value = "安全隐患地址", index = 0)
private String address;
/**
* 隐患简述
*/
- @ExcelProperty(value = "隐患简述" ,index = 1)
+ @ExcelProperty(value = "隐患简述", index = 1)
private String dagerDescription;
/**
* 隐患类型
*/
- @ExcelProperty(value = "隐患类型" ,index = 2)
+ @ExcelProperty(value = "隐患类型", index = 2)
private String dangerType;
+
+ /**
+ * 状态
+ */
+ @ExcelProperty(value = "状态", index = 3)
+ private String status;
/**
* 风险等级
*/
- @ExcelProperty(value = "风险等级" ,index = 3)
+ @ExcelProperty(value = "风险等级", index = 4)
private String dangerLevel;
/**
* 巡查人员
*/
- @ExcelProperty(value = "巡查人员" ,index = 4)
- private String personName;
+ @ExcelProperty(value = "巡查人员", index = 5)
+ private String ppersonName;
/**
* 联系电话
*/
- @ExcelProperty(value = "联系电话" ,index = 5)
- private String personPhone;
+ @ExcelProperty(value = "联系电话", index = 6)
+ private String ppersonPhone;
+
+ /**
+ * 填报时间
+ */
+ @ExcelProperty(value = "填报时间", index = 7)
+ private Date createAt;
/**
* 备注
*/
- @ExcelProperty(value = "备注" ,index = 6)
+ @ExcelProperty(value = "备注", index = 8)
private String remark;
-}
+ /**
+ * 整改人员
+ */
+ @ExcelProperty(value = "整改人员", index = 9)
+ private String dpersonName;
+ /**
+ * 联系电话
+ */
+ @ExcelProperty(value = "联系电话", index = 10)
+ private String dpersonPhone;
+
+ /**
+ * 整改时间
+ */
+ @ExcelProperty(value = "整改时间", index = 11)
+ private Date rectifyTime;
+
+}
--
Gitblit v1.7.1