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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 905fd09..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
@@ -1,13 +1,12 @@
package com.ruoyi.project.tr.hiddenDangerCheckPoint.domain;
import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
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;
@@ -18,6 +17,7 @@
* 隐患排查检查点信息表 tr_hidden_danger_check_point
*
*/
+@Data
public class HiddenDangerCheckPoint extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -347,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;
@@ -435,7 +436,13 @@
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;
@@ -448,10 +455,11 @@
/**
* 隐患来源
* 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
- * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他；11-政府执法检查
+ * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
* */
@Transient
private Byte dangerSrc;
+
// /**
// * 隐患描述
// * */
@@ -487,6 +495,15 @@
@Transient
private Long mobileCode;
+ @Transient
+ private Integer tag;
+
+ @Transient
+ private String checkDesc;
+
+ @Transient
+ private List<PreventRiskDangerConfirmLog> confirmLogList;
+
public Long getMobileCode() {
return mobileCode;
--
Gitblit v1.9.2