From 9a12866758b1749953e1330c2e64d25d7a6a05b5 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期四, 09 十一月 2023 14:11:48 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java
index 473f4a6..c01ed06 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java
@@ -1,5 +1,6 @@
package com.thhy.secure.modules.biz.hiddenDanger.entity;
+import com.thhy.general.annotations.Excel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -24,36 +25,42 @@
/**
* 隐患地点
*/
+ @Excel(sort = 2,title = "隐患地点")
private String dangerLocation;
/**
* 隐患标题
*/
+ @Excel(sort = 3,title = "隐患标题")
private String title;
/**
* 隐患时间
*/
+ @Excel(sort = 1,title = "举报时间",patter = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 隐患审核状态 审核状态 0未审核 1审核通过 2审核失败
*/
private Integer auditStatus;
+ @Excel(sort = 6,title = "审核状态")
private String auditStatusName;
public String getAuditStatusName() {
String name = "";
- switch (auditStatus){
- case 0:
- name = "未审核";
- break;
- case 1:
- name = "已审核";
- break;
- case 2:
- name = "审核失败";
- break;
+ if (auditStatus != null){
+ switch (auditStatus){
+ case 0:
+ name = "未审核";
+ break;
+ case 1:
+ name = "已审核";
+ break;
+ case 2:
+ name = "审核失败";
+ break;
+ }
}
return name;
}
@@ -71,6 +78,7 @@
/**
* 积分
*/
+ @Excel(sort = 7,title = "积分")
private Double integral;
/**
@@ -78,4 +86,34 @@
*/
private List<HiddenDangerImgEntity> imgEntities;
+ /**
+ * 举报人
+ */
+ @Excel(sort = 4,title = "提交人")
+ private String reporter;
+
+ /**
+ * 隐患等级
+ */
+ private Integer level;
+ @Excel(sort = 5,title = "隐患等级")
+ private String levelName;
+
+ public String getLevelName() {
+ String name = "";
+ if (level != null){
+ switch (level){
+ case 1:
+ name = "一般隐患";
+ break;
+ case 2:
+ name = "重大隐患";
+ break;
+ case 3:
+ name = "不存在";
+ break;
+ }
+ }
+ return name;
+ }
}
--
Gitblit v1.9.3