From 28f6c716269ce5435b103137dd7ec1f1f9ab19ba Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 26 六月 2023 09:16:56 +0800
Subject: [PATCH] 临时提交-已经与app端对接完成

---
 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java |  260 +++++----------------------------------------------
 1 files changed, 26 insertions(+), 234 deletions(-)

diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
index 380c9e9..f861f3a 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
@@ -1,11 +1,12 @@
 package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-//@TableName("prevent_cj_report_danger_info")
+@Data
 public class CJReportDangerInfoDTO{
     /**
      * 主键
@@ -15,26 +16,6 @@
      * 公司编码
      */
     private String companyCode;
-    /**
-     * 删除标志:0-有效,1-删除
-     */
-    private String deleted;
-    /**
-     * 创建时间
-     */
-    private String createDate;
-    /**
-     * 创建人
-     */
-    private String createBy;
-    /**
-     * 最后修改时间
-     */
-    private String updateDate;
-    /**
-     * 修改人
-     */
-    private String updateBy;
     /**
      * 安全风险分析对象编码
      */
@@ -92,6 +73,10 @@
      */
     private String hazardDangerType;
     /**
+     * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
+     */
+    private String hazardCategory;
+    /**
      * 登记人姓名
      */
     private String registrant;
@@ -115,220 +100,27 @@
      * 验收时间
      */
     private String checkAcceptTime;
+    /**
+     * 删除标志:0-有效,1-删除
+     */
+    private String deleted;
+    /**
+     * 创建时间
+     */
+    private String createDate;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 最后修改时间
+     */
+    private String updateDate;
+    /**
+     * 修改人
+     */
+    private String updateBy;
 
-    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 String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    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 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 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 String getDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(String deleted) {
-        this.deleted = deleted;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(String updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public String getDangerManageDeadline() {
-        return dangerManageDeadline;
-    }
-
-    public void setDangerManageDeadline(String dangerManageDeadline) {
-        this.dangerManageDeadline = dangerManageDeadline;
-    }
-
-    public String getRegistTime() {
-        return registTime;
-    }
-
-    public void setRegistTime(String registTime) {
-        this.registTime = registTime;
-    }
-
-    public String getCheckAcceptTime() {
-        return checkAcceptTime;
-    }
-
-    public void setCheckAcceptTime(String checkAcceptTime) {
-        this.checkAcceptTime = checkAcceptTime;
-    }
 }
 

--
Gitblit v1.9.2