From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取

---
 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java |  271 ++++++++++++++++-------------------------------------
 1 files changed, 83 insertions(+), 188 deletions(-)

diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
index aeb9963..920a712 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
@@ -1,188 +1,83 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.util.Date;
-
-public class PreventRiskDangerInfo {
-
-    /**
-     * 主键
-     * */
-    @TableId(value = "id" , type = IdType.AUTO)
-    private Long id;
-    /**
-     * Uuid
-     * */
-    private String Uuid;
-    /**
-     * 核查任务附属表id
-     * */
-    private Long dangerCheckPointId;
-    /**
-     * hazard_code 风先分析对象编码(风险分析单元编码)
-     * */
-    private String hazardCode;
-    /**
-     *  隐患来源
-     * 1-日常排查;2-综合性排查;3-专业性排查;4-季节性排查;5-重点时段及节假日前排查
-     * 6-事故类比排查;7-复产复工前排查;8-外聘专家诊断式排查;9-管控措施实效;10-其他;11-政府执法检查
-     * */
-    private Byte dangerSrc;
-    /**
-     * 隐患描述
-     * */
-    private String dangerDesc;
-    /**
-     * 隐患产生的原因
-     * */
-    private String dangerReason;
-    /**
-     * 隐患类型
-     *  1-安全;2-工艺;3-电气;4-仪表
-     *  5-消防;6-总图;7-设备;8其他
-     * */
-    private Byte hazardDangerType;
-    /**
-     * 隐患状态
-     *  0-整改中
-     *  1-待验收
-     *  2-延期整改
-     *  3-超期未整改
-     *  9-已验收
-     */
-    private Byte dangerState;
-    /**
-     * 延期标识 1-正常;2-延期;
-     * */
-    private Byte timeoutFlag;
-    /**
-     * 同步时间
-     */
-    private Date reportTime;
-    /**
-     * 同步数据修改时间
-     */
-    private Date updateReportDataTime;
-    /**
-     * 上报状态 1-待上报;2-已上报;3-不上报;4-变更需上传
-     */
-    private Byte reportStatus;
-    /**
-     * 上报开关 1-上报;2-不上报
-     */
-    private Byte reportSwitch;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getUuid() {
-        return Uuid;
-    }
-
-    public void setUuid(String uuid) {
-        Uuid = uuid;
-    }
-
-    public Long getDangerCheckPointId() {
-        return dangerCheckPointId;
-    }
-
-    public void setDangerCheckPointId(Long dangerCheckPointId) {
-        this.dangerCheckPointId = dangerCheckPointId;
-    }
-
-    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 getDangerDesc() {
-        return dangerDesc;
-    }
-
-    public void setDangerDesc(String dangerDesc) {
-        this.dangerDesc = dangerDesc;
-    }
-
-    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 Byte getDangerState() {
-        return dangerState;
-    }
-
-    public void setDangerState(Byte dangerState) {
-        this.dangerState = dangerState;
-    }
-
-    public Byte getTimeoutFlag() {
-        return timeoutFlag;
-    }
-
-    public void setTimeoutFlag(Byte timeoutFlag) {
-        this.timeoutFlag = timeoutFlag;
-    }
-
-    public Date getReportTime() {
-        return reportTime;
-    }
-
-    public void setReportTime(Date reportTime) {
-        this.reportTime = reportTime;
-    }
-
-    public Date getUpdateReportDataTime() {
-        return updateReportDataTime;
-    }
-
-    public void setUpdateReportDataTime(Date updateReportDataTime) {
-        this.updateReportDataTime = updateReportDataTime;
-    }
-
-    public Byte getReportStatus() {
-        return reportStatus;
-    }
-
-    public void setReportStatus(Byte reportStatus) {
-        this.reportStatus = reportStatus;
-    }
-
-    public Byte getReportSwitch() {
-        return reportSwitch;
-    }
-
-    public void setReportSwitch(Byte reportSwitch) {
-        this.reportSwitch = reportSwitch;
-    }
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class PreventRiskDangerInfo {
+
+    /**
+     * 主键
+     * */
+    @TableId(value = "id" , type = IdType.AUTO)
+    private Long id;
+    /**
+     * Uuid
+     * */
+    private String Uuid;
+    /**
+     * 核查任务附属表id
+     * */
+    private Long dangerCheckPointId;
+    /**
+     * hazard_code 风先分析对象编码(风险分析单元编码)
+     * */
+    private String hazardCode;
+    /**
+     *  隐患来源
+     * 1-日常排查;2-综合性排查;3-专业性排查;4-季节性排查;5-重点时段及节假日前排查
+     * 6-事故类比排查;7-复产复工前排查;8-外聘专家诊断式排查;9-管控措施实效;10-其他
+     * */
+    private Byte dangerSrc;
+    /**
+     * 隐患描述
+     * */
+    private String dangerDesc;
+    /**
+     * 隐患产生的原因
+     * */
+    private String dangerReason;
+    /**
+     * 隐患类型
+     *  1-安全;2-工艺;3-电气;4-仪表
+     *  5-消防;6-总图;7-设备;8其他
+     * */
+    private Byte hazardDangerType;
+    /**
+     * 隐患状态
+     *  0-整改中
+     *  1-待验收
+     *  2-延期整改
+     *  3-超期未整改
+     *  9-已验收
+     */
+    private Byte dangerState;
+    /**
+     * 延期标识 1-正常;2-延期;
+     * */
+    private Byte timeoutFlag;
+    /**
+     * 隐患造成的结果:1-无;2-轻伤;3-重伤;4-死亡
+     */
+    private Byte dangerResult;
+    /**
+     * 同步时间
+     */
+    private Date reportTime;
+    /**
+     * 同步数据修改时间
+     */
+    private Date updateReportDataTime;
+    /**
+     * 上报状态 1-待上报;2-已上报;3-不上报;4-变更需上传
+     */
+    private Byte reportStatus;
+    /**
+     * 上报开关 1-上报;2-不上报
+     */
+    private Byte reportSwitch;
+
+
+}

--
Gitblit v1.9.2