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/CJReport/PreventCJReportDangerInfo.java | 549 +++++++++++++++---------------------------------------
1 files changed, 151 insertions(+), 398 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
index 1641dda..86d7dd2 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
@@ -1,398 +1,151 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName("prevent_cj_report_danger_info")
-public class PreventCJReportDangerInfo implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 安全风险分析对象编码
- */
- private String hazardCode;
- /**
- * 管控措施 ID-->管控措施UUID
- */
- private String riskMeasureId;
- /**
- * 隐患排查记录 ID-->隐患排查任务UUID
- */
- private String checkRecordId;
- /**
- * 隐患名称
- */
- private String dangerName;
- /**
- * 隐患等级
- */
- private String dangerLevel;
- /**
- * 隐患来源
- */
- private String dangerSrc;
- /**
- * 隐患治理类型
- */
- private String dangerManageType;
- /**
- * 隐患描述
- */
- private String dangerDesc;
- /**
- * 隐患产生原因
- */
- private String dangerReason;
- /**
- * 控制措施
- */
- private String controlMeasures;
- /**
- * 资金
- */
- private String cost;
- /**
- * 隐患治理期限
- */
- private Date dangerManageDeadline;
- /**
- * 隐患状态
- */
- private String dangerState;
- /**
- * 隐患类型
- */
- private String hazardDangerType;
- /**
- * 登记人姓名
- */
- private String registrant;
- /**
- * 登记时间
- */
- private Date registTime;
- /**
- * 整改责任人姓名
- */
- private String liablePerson;
- /**
- * 验收人
- */
- private String checkAcceptPerson;
- /**
- * 验收情况
- */
- private String checkAcceptComment;
- /**
- * 验收时间
- */
- private Date checkAcceptTime;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Long dangerManagerId;
-
- public Long getDangerManagerId() {
- return dangerManagerId;
- }
-
- public void setDangerManagerId(Long dangerManagerId) {
- this.dangerManagerId = dangerManagerId;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public String getHazardCode() {
- return hazardCode;
- }
-
- public void setHazardCode(String hazardCode) {
- this.hazardCode = hazardCode;
- }
-
- public String getRiskMeasureId() {
- return riskMeasureId;
- }
-
- public void setRiskMeasureId(String riskMeasureId) {
- this.riskMeasureId = riskMeasureId;
- }
-
- public String getCheckRecordId() {
- return checkRecordId;
- }
-
- public void setCheckRecordId(String checkRecordId) {
- this.checkRecordId = checkRecordId;
- }
-
- public String getDangerName() {
- return dangerName;
- }
-
- public void setDangerName(String dangerName) {
- this.dangerName = dangerName;
- }
-
- public String getDangerLevel() {
- return dangerLevel;
- }
-
- public void setDangerLevel(String dangerLevel) {
- this.dangerLevel = dangerLevel;
- }
-
- public String getDangerSrc() {
- return dangerSrc;
- }
-
- public void setDangerSrc(String dangerSrc) {
- this.dangerSrc = dangerSrc;
- }
-
- public String getDangerManageType() {
- return dangerManageType;
- }
-
- public void setDangerManageType(String dangerManageType) {
- this.dangerManageType = dangerManageType;
- }
-
- 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 String getControlMeasures() {
- return controlMeasures;
- }
-
- public void setControlMeasures(String controlMeasures) {
- this.controlMeasures = controlMeasures;
- }
-
- public String getCost() {
- return cost;
- }
-
- public void setCost(String cost) {
- this.cost = cost;
- }
-
- public Date getDangerManageDeadline() {
- return dangerManageDeadline;
- }
-
- public void setDangerManageDeadline(Date dangerManageDeadline) {
- this.dangerManageDeadline = dangerManageDeadline;
- }
-
- public String getDangerState() {
- return dangerState;
- }
-
- public void setDangerState(String dangerState) {
- this.dangerState = dangerState;
- }
-
- public String getHazardDangerType() {
- return hazardDangerType;
- }
-
- public void setHazardDangerType(String hazardDangerType) {
- this.hazardDangerType = hazardDangerType;
- }
-
- public String getRegistrant() {
- return registrant;
- }
-
- public void setRegistrant(String registrant) {
- this.registrant = registrant;
- }
-
- public Date getRegistTime() {
- return registTime;
- }
-
- public void setRegistTime(Date registTime) {
- this.registTime = registTime;
- }
-
- public String getLiablePerson() {
- return liablePerson;
- }
-
- public void setLiablePerson(String liablePerson) {
- this.liablePerson = liablePerson;
- }
-
- public String getCheckAcceptPerson() {
- return checkAcceptPerson;
- }
-
- public void setCheckAcceptPerson(String checkAcceptPerson) {
- this.checkAcceptPerson = checkAcceptPerson;
- }
-
- public String getCheckAcceptComment() {
- return checkAcceptComment;
- }
-
- public void setCheckAcceptComment(String checkAcceptComment) {
- this.checkAcceptComment = checkAcceptComment;
- }
-
- public Date getCheckAcceptTime() {
- return checkAcceptTime;
- }
-
- public void setCheckAcceptTime(Date checkAcceptTime) {
- this.checkAcceptTime = checkAcceptTime;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("prevent_cj_report_danger_info")
+public class PreventCJReportDangerInfo implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 管控措施 ID-->管控措施UUID
+ */
+ private String riskMeasureId;
+ /**
+ * 隐患排查记录 ID-->隐患排查任务UUID
+ */
+ private String checkRecordId;
+ /**
+ * 隐患名称
+ */
+ private String dangerName;
+ /**
+ * 隐患等级
+ */
+ private String dangerLevel;
+ /**
+ * 隐患来源
+ */
+ private String dangerSrc;
+ /**
+ * 隐患治理类型
+ */
+ private String dangerManageType;
+ /**
+ * 隐患描述
+ */
+ private String dangerDesc;
+ /**
+ * 隐患产生原因
+ */
+ private String dangerReason;
+ /**
+ * 控制措施
+ */
+ private String controlMeasures;
+ /**
+ * 资金
+ */
+ private String cost;
+ /**
+ * 隐患治理期限
+ */
+ private Date dangerManageDeadline;
+ /**
+ * 隐患状态
+ */
+ private String dangerState;
+ /**
+ * 隐患类型
+ */
+ private String hazardDangerType;
+ /**
+ * 登记人姓名
+ */
+ private String registrant;
+ /**
+ * 登记时间
+ */
+ private Date registTime;
+ /**
+ * 整改责任人姓名
+ */
+ private String liablePerson;
+ /**
+ * 验收人
+ */
+ private String checkAcceptPerson;
+ /**
+ * 验收情况
+ */
+ private String checkAcceptComment;
+ /**
+ * 验收时间
+ */
+ private Date checkAcceptTime;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Long dangerManagerId;
+ /**
+ * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
+ */
+ private String hazardCategory;
+
+
+
+}
+
--
Gitblit v1.9.2