From ce1798b6f6ef2d4e82a156a22e9646b57a2a3649 Mon Sep 17 00:00:00 2001 From: 邱宇豪 <qyh123230312> Date: 星期三, 08 十一月 2023 14:52:47 +0800 Subject: [PATCH] 20231107_qiuyh_隐患举报 --- 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