1、添加固有风险字段

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanInherentList.java

@@ -87,14 +87,38 @@ public class RiskPlanInherentList extends BaseEntity
     @Excel(name = "工程技术措施附件")
     private String measuresProjectFileIds;
 
-    /** 管理措施 */
-    @Excel(name = "管理措施")
+    /** 应采取的管理措施 */
+    @Excel(name = "应采取的管理措施")
     private String measuresAdministration;
 
-    /** 管理措施附件 */
-    @Excel(name = "管理措施附件")
+    /** 已采取的管理措施 */
+    @Excel(name = "已采取的管理措施")
+    private String takenMeasuresAdministration;
+
+    /** 管控责任单位id */
+    @Excel(name = "管控责任单位id")
+    private Long measuresDeptId;
+
+    /** 管控责任人id */
+    @Excel(name = "管控责任人id")
+    private String measuresUserId;
+
+    /** 已采取的管理措施 */
+    @Excel(name = "已采取的管理措施附件")
     private String measuresAdministrationFileIds;
 
+    /** 危险源名称 */
+    @Excel(name = "危险源名称")
+    private String hazardSourceName;
+
+    /** 是否存在重大危险源 */
+    @Excel(name = "是否存在重大危险源")
+    private Boolean majorHazardSource;
+
+    /** 重大危险源描述 */
+    @Excel(name = "重大危险源描述")
+    private Boolean majorHazardSourceDescription;
+
     /** 应急处置措施 */
     @Excel(name = "应急处置措施")
     private String measuresEmergency;
@@ -325,6 +349,54 @@ public class RiskPlanInherentList extends BaseEntity
         this.riskSeverity = riskSeverity;
     }
 
+    public String getTakenMeasuresAdministration() {
+        return takenMeasuresAdministration;
+    }
+
+    public void setTakenMeasuresAdministration(String takenMeasuresAdministration) {
+        this.takenMeasuresAdministration = takenMeasuresAdministration;
+    }
+
+    public Long getMeasuresDeptId() {
+        return measuresDeptId;
+    }
+
+    public void setMeasuresDeptId(Long measuresDeptId) {
+        this.measuresDeptId = measuresDeptId;
+    }
+
+    public String getMeasuresUserId() {
+        return measuresUserId;
+    }
+
+    public void setMeasuresUserId(String measuresUserId) {
+        this.measuresUserId = measuresUserId;
+    }
+
+    public String getHazardSourceName() {
+        return hazardSourceName;
+    }
+
+    public void setHazardSourceName(String hazardSourceName) {
+        this.hazardSourceName = hazardSourceName;
+    }
+
+    public Boolean getMajorHazardSource() {
+        return majorHazardSource;
+    }
+
+    public void setMajorHazardSource(Boolean majorHazardSource) {
+        this.majorHazardSource = majorHazardSource;
+    }
+
+    public Boolean getMajorHazardSourceDescription() {
+        return majorHazardSourceDescription;
+    }
+
+    public void setMajorHazardSourceDescription(Boolean majorHazardSourceDescription) {
+        this.majorHazardSourceDescription = majorHazardSourceDescription;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskInherentListSaveDto.java

 package com.censoft.censoftrongtong.domain.dto;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 固有风险清单库对象 risk_inherent_list
@@ -51,12 +47,30 @@ public class RiskInherentListSaveDto{
     /** 工程技术措施附件 */
     private String measuresProjectFileIds;
 
-    /** 管理措施 */
+    /** 应采取的管理措施 */
     private String measuresAdministration;
 
+    /** 已采取的管理措施 */
+    private String takenMeasuresAdministration;
+
+    /** 管控责任单位id */
+    private Long measuresDeptId;
+
+    /** 管控责任人id */
+    private String measuresUserId;
+
     /** 管理措施附件 */
     private String measuresAdministrationFileIds;
 
+    /** 危险源名称 */
+    private String hazardSourceName;
+
+    /** 是否存在重大危险源 */
+    private Boolean majorHazardSource;
+
+    /** 重大危险源描述 */
+    private Boolean majorHazardSourceDescription;
+
     /** 应急处置措施 */
     private String measuresEmergency;