From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 24 六月 2025 10:24:43 +0800
Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java | 122 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
index f0e3c20..8d2283d 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java
@@ -2,9 +2,11 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
-import com.ruoyi.project.system.company.domain.Company;
+import kotlin.jvm.Transient;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -15,6 +17,7 @@
* 隐患排查检查点信息表 tr_hidden_danger_check_point
*
*/
+@Data
public class HiddenDangerCheckPoint extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -344,6 +347,7 @@
/** 验收创建时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "验收创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date acceptCreateTime;
@@ -432,6 +436,122 @@
private Long companyId;
+ private String checkPerson;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date findTime;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date reportTime;
+
+
+
+
+ /**
+ * hazard_code 风先分析对象编码（风险分析单元编码）
+ * */
+ @Transient
+ private String hazardCode;
+ /**
+ * 隐患来源
+ * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
+ * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
+ * */
+ @Transient
+ private Byte dangerSrc;
+
+// /**
+// * 隐患描述
+// * */
+// private String dangerDesc;
+ /**
+ * 隐患产生的原因
+ * */
+ @Transient
+ private String dangerReason;
+ /**
+ * 隐患类型
+ * 1-安全；2-工艺；3-电气；4-仪表
+ * 5-消防；6-总图；7-设备；8其他
+ * */
+ @Transient
+ private Byte hazardDangerType;
+// /**
+// * 隐患状态
+// * 0-整改中
+// * 1-待验收
+// * 2-延期整改
+// * 3-超期未整改
+// * 9-已验收
+// */
+// private Byte dangerState;
+ /**
+ * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡
+ */
+ @Transient
+ private Byte dangerResult;
+
+
+ @Transient
+ private Long mobileCode;
+
+ @Transient
+ private Integer tag;
+
+ @Transient
+ private String checkDesc;
+
+ @Transient
+ private List<PreventRiskDangerConfirmLog> confirmLogList;
+
+
+ public Long getMobileCode() {
+ return mobileCode;
+ }
+
+ public void setMobileCode(Long mobileCode) {
+ this.mobileCode = mobileCode;
+ }
+
+ public Byte getDangerResult() {
+ return dangerResult;
+ }
+
+ public void setDangerResult(Byte dangerResult) {
+ this.dangerResult = dangerResult;
+ }
+
+ public String getHazardCode() {
+ return hazardCode;
+ }
+
+ public void setHazardCode(String hazardCode) {
+ this.hazardCode = hazardCode;
+ }
+
+ public Byte getDangerSrc() {
+ return dangerSrc;
+ }
+
+ public void setDangerSrc(Byte dangerSrc) {
+ this.dangerSrc = dangerSrc;
+ }
+
+ public String getDangerReason() {
+ return dangerReason;
+ }
+
+ public void setDangerReason(String dangerReason) {
+ this.dangerReason = dangerReason;
+ }
+
+ public Byte getHazardDangerType() {
+ return hazardDangerType;
+ }
+
+ public void setHazardDangerType(Byte hazardDangerType) {
+ this.hazardDangerType = hazardDangerType;
+ }
public List<Long> getCompanyIdList() {
return companyIdList;
--
Gitblit v1.9.2