From 5ea8ef80312e8c1d3365abe7106622d676def195 Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: 星期五, 30 九月 2022 16:41:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ruoyi/doublePrevention/entity/TrHiddenDangerCheckPoint.java |  658 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 658 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/TrHiddenDangerCheckPoint.java b/src/main/java/com/ruoyi/doublePrevention/entity/TrHiddenDangerCheckPoint.java
new file mode 100644
index 0000000..427585e
--- /dev/null
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/TrHiddenDangerCheckPoint.java
@@ -0,0 +1,658 @@
+package com.ruoyi.doublePrevention.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description 只用于接收对象  新增不用这个实体类 用源系统的实体类
+ */
+@TableName("tr_hidden_danger_check_point")
+public class TrHiddenDangerCheckPoint {
+
+    /** 主键ID */
+    private Long id;
+
+    /** 隐患排查检查点信息ID */
+    private Long checkPointId;
+
+    /** 隐患排查ID */
+    private Long checkId;
+
+    /** 创建人 */
+    private String createBy;
+
+    /** 创建时间 */
+    private Date createTime;
+
+    /** 更新人 */
+    private String updateBy;
+
+    /** 更新时间 */
+    private Date updateTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 是否为隐患 */
+    private String whetherDanger;
+
+    /** 隐患名称 */
+    private String dangerName;
+
+    /** 隐患描述 */
+    private String dangerDescription;
+
+    /** 隐患级别(0一般隐患 1重大隐患) */
+    private String dangerLevel;
+
+    /** 隐患类别ID */
+    private Long troubleTypeId;
+
+    /** 隐患类别名称 */
+    private String troubleTypeName;
+
+    /** 排查时间 */
+    private Date checkTime;
+
+    /** 隐患整改前照片 */
+    private String preRectifyPhoto;
+
+    /** 登记人ID */
+    private Long registerUserId;
+
+    /** 登记人名称 */
+    private String registerUserName;
+
+    /** 登记创建时间 */
+    private Date registerCreateTime;
+
+
+    /** 登记提交时间 */
+   private Date registerSubmitTime;
+
+    /** 判定人ID */
+    private Long judgeUserId;
+
+    /** 判定人名称 */
+    private String judgeUserName;
+
+
+    /** 判定创建时间 */
+    private Date judgeCreateTime;
+
+
+    /** 隐患上报创建人ID */
+    private Long judgeCreateUserId;
+
+    /** 隐患来源(1隐患计划排查生成 2隐患上报生成) */
+    private String dangerSources;
+
+    /** 上报判定结果(0未判定 1不是隐患 2是隐患) */
+    private String reportStatus;
+
+    /** 核查人ID */
+    private Long examineUserId;
+
+    /** 核查人名称 */
+    private String examineUserName;
+
+    /** 核查状态(0待核查 1已核查) */
+    private String examineStatus;
+
+    /** 隐患核查意见 */
+    private String examineOpinion;
+
+    /** 隐患核查结果(0一般隐患 1重大隐患) */
+    private String examineResult;
+
+    /** 核查创建时间 */
+    private Date examineCreateTime;
+
+    /** 治理措施 */
+    private String treatMeasure;
+
+    /** 整改人ID */
+    private Long rectifyUserId;
+
+    /** 整改人名称 */
+    private String rectifyUserName;
+
+    /** 隐患整改责任部门ID */
+    private Long rectifyDeptId;
+
+    /** 隐患整改责任部门名称 */
+    private String rectifyDeptName;
+
+    /** 完成期限 */
+    private Date rectifyDeadlineTime;
+
+    /** 整改类型(1立即整改 2限期整改 3停产停业整改) */
+    private String rectifyType;
+
+    /** 整改附件地址 */
+    private String rectifyAttachment;
+
+    /** 整改措施 */
+    private String rectifyMeasure;
+
+    /** 整改情况 */
+    private String rectifyCondition;
+
+    /** 整改资金 */
+    private String rectifyFund;
+
+    /** 整改完成时间 */
+    private Date rectifyCompleteTime;
+
+    /** 整改状态(0未整改 1已整改) */
+    private String rectifyStatus;
+
+    /** 整改创建时间 */
+    private Date rectifyCreateTime;
+
+    /** 验收负责人ID */
+    private Long acceptUserId;
+
+    /** 验收负责人姓名 */
+    private String acceptUserName;
+
+    /** 隐患整改后照片 */
+    private String postRectifyPhoto;
+
+    /** 验收结果 */
+    private String acceptResult;
+
+    /** 验收意见 */
+    private String acceptOpinion;
+
+    /** 验收文件 */
+    private String acceptFile;
+
+    /** 验收状态(0未验收 1验收通过) */
+    private String acceptStatus;
+
+
+    /** 验收创建时间 */
+    private Date acceptCreateTime;
+
+    /** 隐患排查阶段(1隐患排查计划制定阶段 2隐患排查计划执行阶段 3隐患核查阶段 4隐患整改阶段 5隐患验收阶段) */
+    private String stage;
+
+    /** 排查状态(0待排查 1已排查)(定时任务生成的数据) */
+    private String scheduleCheckStatus;
+
+    //排查类型(1基础清单排查 2选择风险单元清单排查)
+    private String checkType;
+
+    /** 公司id */
+    private Long companyId;
+
+    public Long getId() {
+     return id;
+    }
+
+    public void setId(Long id) {
+     this.id = id;
+    }
+
+    public Long getCheckPointId() {
+     return checkPointId;
+    }
+
+    public void setCheckPointId(Long checkPointId) {
+     this.checkPointId = checkPointId;
+    }
+
+    public Long getCheckId() {
+     return checkId;
+    }
+
+    public void setCheckId(Long checkId) {
+     this.checkId = checkId;
+    }
+
+    public String getCreateBy() {
+     return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+     this.createBy = createBy;
+    }
+
+    public Date getCreateTime() {
+     return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+     this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+     return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+     this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime() {
+     return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+     this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+     return remark;
+    }
+
+    public void setRemark(String remark) {
+     this.remark = remark;
+    }
+
+    public String getWhetherDanger() {
+     return whetherDanger;
+    }
+
+    public void setWhetherDanger(String whetherDanger) {
+     this.whetherDanger = whetherDanger;
+    }
+
+    public String getDangerName() {
+     return dangerName;
+    }
+
+    public void setDangerName(String dangerName) {
+     this.dangerName = dangerName;
+    }
+
+    public String getDangerDescription() {
+     return dangerDescription;
+    }
+
+    public void setDangerDescription(String dangerDescription) {
+     this.dangerDescription = dangerDescription;
+    }
+
+    public String getDangerLevel() {
+     return dangerLevel;
+    }
+
+    public void setDangerLevel(String dangerLevel) {
+     this.dangerLevel = dangerLevel;
+    }
+
+    public Long getTroubleTypeId() {
+     return troubleTypeId;
+    }
+
+    public void setTroubleTypeId(Long troubleTypeId) {
+     this.troubleTypeId = troubleTypeId;
+    }
+
+    public String getTroubleTypeName() {
+     return troubleTypeName;
+    }
+
+    public void setTroubleTypeName(String troubleTypeName) {
+     this.troubleTypeName = troubleTypeName;
+    }
+
+    public Date getCheckTime() {
+     return checkTime;
+    }
+
+    public void setCheckTime(Date checkTime) {
+     this.checkTime = checkTime;
+    }
+
+    public String getPreRectifyPhoto() {
+     return preRectifyPhoto;
+    }
+
+    public void setPreRectifyPhoto(String preRectifyPhoto) {
+     this.preRectifyPhoto = preRectifyPhoto;
+    }
+
+    public Long getRegisterUserId() {
+     return registerUserId;
+    }
+
+    public void setRegisterUserId(Long registerUserId) {
+     this.registerUserId = registerUserId;
+    }
+
+    public String getRegisterUserName() {
+     return registerUserName;
+    }
+
+    public void setRegisterUserName(String registerUserName) {
+     this.registerUserName = registerUserName;
+    }
+
+    public Date getRegisterCreateTime() {
+     return registerCreateTime;
+    }
+
+    public void setRegisterCreateTime(Date registerCreateTime) {
+     this.registerCreateTime = registerCreateTime;
+    }
+
+    public Date getRegisterSubmitTime() {
+     return registerSubmitTime;
+    }
+
+    public void setRegisterSubmitTime(Date registerSubmitTime) {
+     this.registerSubmitTime = registerSubmitTime;
+    }
+
+    public Long getJudgeUserId() {
+     return judgeUserId;
+    }
+
+    public void setJudgeUserId(Long judgeUserId) {
+     this.judgeUserId = judgeUserId;
+    }
+
+    public String getJudgeUserName() {
+     return judgeUserName;
+    }
+
+    public void setJudgeUserName(String judgeUserName) {
+     this.judgeUserName = judgeUserName;
+    }
+
+    public Date getJudgeCreateTime() {
+     return judgeCreateTime;
+    }
+
+    public void setJudgeCreateTime(Date judgeCreateTime) {
+     this.judgeCreateTime = judgeCreateTime;
+    }
+
+    public Long getJudgeCreateUserId() {
+     return judgeCreateUserId;
+    }
+
+    public void setJudgeCreateUserId(Long judgeCreateUserId) {
+     this.judgeCreateUserId = judgeCreateUserId;
+    }
+
+    public String getDangerSources() {
+     return dangerSources;
+    }
+
+    public void setDangerSources(String dangerSources) {
+     this.dangerSources = dangerSources;
+    }
+
+    public String getReportStatus() {
+     return reportStatus;
+    }
+
+    public void setReportStatus(String reportStatus) {
+     this.reportStatus = reportStatus;
+    }
+
+    public Long getExamineUserId() {
+     return examineUserId;
+    }
+
+    public void setExamineUserId(Long examineUserId) {
+     this.examineUserId = examineUserId;
+    }
+
+    public String getExamineUserName() {
+     return examineUserName;
+    }
+
+    public void setExamineUserName(String examineUserName) {
+     this.examineUserName = examineUserName;
+    }
+
+    public String getExamineStatus() {
+     return examineStatus;
+    }
+
+    public void setExamineStatus(String examineStatus) {
+     this.examineStatus = examineStatus;
+    }
+
+    public String getExamineOpinion() {
+     return examineOpinion;
+    }
+
+    public void setExamineOpinion(String examineOpinion) {
+     this.examineOpinion = examineOpinion;
+    }
+
+    public String getExamineResult() {
+     return examineResult;
+    }
+
+    public void setExamineResult(String examineResult) {
+     this.examineResult = examineResult;
+    }
+
+    public Date getExamineCreateTime() {
+     return examineCreateTime;
+    }
+
+    public void setExamineCreateTime(Date examineCreateTime) {
+     this.examineCreateTime = examineCreateTime;
+    }
+
+    public String getTreatMeasure() {
+     return treatMeasure;
+    }
+
+    public void setTreatMeasure(String treatMeasure) {
+     this.treatMeasure = treatMeasure;
+    }
+
+    public Long getRectifyUserId() {
+     return rectifyUserId;
+    }
+
+    public void setRectifyUserId(Long rectifyUserId) {
+     this.rectifyUserId = rectifyUserId;
+    }
+
+    public String getRectifyUserName() {
+     return rectifyUserName;
+    }
+
+    public void setRectifyUserName(String rectifyUserName) {
+     this.rectifyUserName = rectifyUserName;
+    }
+
+    public Long getRectifyDeptId() {
+     return rectifyDeptId;
+    }
+
+    public void setRectifyDeptId(Long rectifyDeptId) {
+     this.rectifyDeptId = rectifyDeptId;
+    }
+
+    public String getRectifyDeptName() {
+     return rectifyDeptName;
+    }
+
+    public void setRectifyDeptName(String rectifyDeptName) {
+     this.rectifyDeptName = rectifyDeptName;
+    }
+
+    public Date getRectifyDeadlineTime() {
+     return rectifyDeadlineTime;
+    }
+
+    public void setRectifyDeadlineTime(Date rectifyDeadlineTime) {
+     this.rectifyDeadlineTime = rectifyDeadlineTime;
+    }
+
+    public String getRectifyType() {
+     return rectifyType;
+    }
+
+    public void setRectifyType(String rectifyType) {
+     this.rectifyType = rectifyType;
+    }
+
+    public String getRectifyAttachment() {
+     return rectifyAttachment;
+    }
+
+    public void setRectifyAttachment(String rectifyAttachment) {
+     this.rectifyAttachment = rectifyAttachment;
+    }
+
+    public String getRectifyMeasure() {
+     return rectifyMeasure;
+    }
+
+    public void setRectifyMeasure(String rectifyMeasure) {
+     this.rectifyMeasure = rectifyMeasure;
+    }
+
+    public String getRectifyCondition() {
+     return rectifyCondition;
+    }
+
+    public void setRectifyCondition(String rectifyCondition) {
+     this.rectifyCondition = rectifyCondition;
+    }
+
+    public String getRectifyFund() {
+     return rectifyFund;
+    }
+
+    public void setRectifyFund(String rectifyFund) {
+     this.rectifyFund = rectifyFund;
+    }
+
+    public Date getRectifyCompleteTime() {
+     return rectifyCompleteTime;
+    }
+
+    public void setRectifyCompleteTime(Date rectifyCompleteTime) {
+     this.rectifyCompleteTime = rectifyCompleteTime;
+    }
+
+    public String getRectifyStatus() {
+     return rectifyStatus;
+    }
+
+    public void setRectifyStatus(String rectifyStatus) {
+     this.rectifyStatus = rectifyStatus;
+    }
+
+    public Date getRectifyCreateTime() {
+     return rectifyCreateTime;
+    }
+
+    public void setRectifyCreateTime(Date rectifyCreateTime) {
+     this.rectifyCreateTime = rectifyCreateTime;
+    }
+
+    public Long getAcceptUserId() {
+     return acceptUserId;
+    }
+
+    public void setAcceptUserId(Long acceptUserId) {
+     this.acceptUserId = acceptUserId;
+    }
+
+    public String getAcceptUserName() {
+     return acceptUserName;
+    }
+
+    public void setAcceptUserName(String acceptUserName) {
+     this.acceptUserName = acceptUserName;
+    }
+
+    public String getPostRectifyPhoto() {
+     return postRectifyPhoto;
+    }
+
+    public void setPostRectifyPhoto(String postRectifyPhoto) {
+     this.postRectifyPhoto = postRectifyPhoto;
+    }
+
+    public String getAcceptResult() {
+     return acceptResult;
+    }
+
+    public void setAcceptResult(String acceptResult) {
+     this.acceptResult = acceptResult;
+    }
+
+    public String getAcceptOpinion() {
+     return acceptOpinion;
+    }
+
+    public void setAcceptOpinion(String acceptOpinion) {
+     this.acceptOpinion = acceptOpinion;
+    }
+
+    public String getAcceptFile() {
+     return acceptFile;
+    }
+
+    public void setAcceptFile(String acceptFile) {
+     this.acceptFile = acceptFile;
+    }
+
+    public String getAcceptStatus() {
+     return acceptStatus;
+    }
+
+    public void setAcceptStatus(String acceptStatus) {
+     this.acceptStatus = acceptStatus;
+    }
+
+    public Date getAcceptCreateTime() {
+     return acceptCreateTime;
+    }
+
+    public void setAcceptCreateTime(Date acceptCreateTime) {
+     this.acceptCreateTime = acceptCreateTime;
+    }
+
+    public String getStage() {
+     return stage;
+    }
+
+    public void setStage(String stage) {
+     this.stage = stage;
+    }
+
+    public String getScheduleCheckStatus() {
+     return scheduleCheckStatus;
+    }
+
+    public void setScheduleCheckStatus(String scheduleCheckStatus) {
+     this.scheduleCheckStatus = scheduleCheckStatus;
+    }
+
+    public String getCheckType() {
+     return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+     this.checkType = checkType;
+    }
+
+    public Long getCompanyId() {
+     return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+     this.companyId = companyId;
+    }
+}

--
Gitblit v1.9.2