forked from xxhjsb/wit-park-backend
隐患表新增排查人员
parent
60c758f8c6
commit
458f3ee4b0
|
|
@ -1,11 +1,10 @@
|
|||
package com.hbt.safety.supervision.pojo;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.hbt.common.core.annotation.Excel;
|
||||
import com.hbt.common.core.web.domain.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 隐患对象 hidden_danger
|
||||
|
|
@ -14,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
|
|||
* @date 2023-02-14
|
||||
*/
|
||||
@ApiModel
|
||||
@Data
|
||||
public class HiddenDanger extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
|
@ -85,176 +85,11 @@ public class HiddenDanger extends BaseEntity
|
|||
@ApiModelProperty(value = "整改期限")
|
||||
private String rectificationPeriod;
|
||||
|
||||
public void setId(int id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
/** 排查人员id */
|
||||
@ApiModelProperty(value = "排查人员id")
|
||||
private String investigatorId;
|
||||
|
||||
public int getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setName(String name)
|
||||
{
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
public void setDetails(String details)
|
||||
{
|
||||
this.details = details;
|
||||
}
|
||||
|
||||
public String getDetails()
|
||||
{
|
||||
return details;
|
||||
}
|
||||
public void setRiskId(int riskId)
|
||||
{
|
||||
this.riskId = riskId;
|
||||
}
|
||||
|
||||
public int getRiskId()
|
||||
{
|
||||
return riskId;
|
||||
}
|
||||
public void setSubmitDate(Date submitDate)
|
||||
{
|
||||
this.submitDate = submitDate;
|
||||
}
|
||||
|
||||
public Date getSubmitDate()
|
||||
{
|
||||
return submitDate;
|
||||
}
|
||||
public void setSubmitPersonId(int submitPersonId)
|
||||
{
|
||||
this.submitPersonId = submitPersonId;
|
||||
}
|
||||
|
||||
public int getSubmitPersonId()
|
||||
{
|
||||
return submitPersonId;
|
||||
}
|
||||
public void setReformMeasures(String reformMeasures)
|
||||
{
|
||||
this.reformMeasures = reformMeasures;
|
||||
}
|
||||
|
||||
public String getReformMeasures()
|
||||
{
|
||||
return reformMeasures;
|
||||
}
|
||||
public void setReformStatus(int reformStatus)
|
||||
{
|
||||
this.reformStatus = reformStatus;
|
||||
}
|
||||
|
||||
public int getReformStatus()
|
||||
{
|
||||
return reformStatus;
|
||||
}
|
||||
public void setExceedTimeLimitStatus(int exceedTimeLimitStatus)
|
||||
{
|
||||
this.exceedTimeLimitStatus = exceedTimeLimitStatus;
|
||||
}
|
||||
|
||||
public int getExceedTimeLimitStatus()
|
||||
{
|
||||
return exceedTimeLimitStatus;
|
||||
}
|
||||
public void setEnterpriseId(int enterpriseId)
|
||||
{
|
||||
this.enterpriseId = enterpriseId;
|
||||
}
|
||||
|
||||
public int getEnterpriseId()
|
||||
{
|
||||
return enterpriseId;
|
||||
}
|
||||
public void setPersonId(int personId)
|
||||
{
|
||||
this.personId = personId;
|
||||
}
|
||||
|
||||
public int getPersonId()
|
||||
{
|
||||
return personId;
|
||||
}
|
||||
public void setRemarks(String remarks)
|
||||
{
|
||||
this.remarks = remarks;
|
||||
}
|
||||
|
||||
public String getRemarks()
|
||||
{
|
||||
return remarks;
|
||||
}
|
||||
public void setRectificationPeriod(String rectificationPeriod)
|
||||
{
|
||||
this.rectificationPeriod = rectificationPeriod;
|
||||
}
|
||||
|
||||
public String getRectificationPeriod()
|
||||
{
|
||||
return rectificationPeriod;
|
||||
}
|
||||
|
||||
public int getSubmitEnterpriseId() {
|
||||
return submitEnterpriseId;
|
||||
}
|
||||
|
||||
public void setSubmitEnterpriseId(int submitEnterpriseId) {
|
||||
this.submitEnterpriseId = submitEnterpriseId;
|
||||
}
|
||||
|
||||
public String getRiskName() {
|
||||
return riskName;
|
||||
}
|
||||
|
||||
public void setRiskName(String riskName) {
|
||||
this.riskName = riskName;
|
||||
}
|
||||
|
||||
public String getEnterprise() {
|
||||
return enterprise;
|
||||
}
|
||||
|
||||
public void setEnterprise(String enterprise) {
|
||||
this.enterprise = enterprise;
|
||||
}
|
||||
|
||||
public String getPerson() {
|
||||
return person;
|
||||
}
|
||||
|
||||
public void setPerson(String person) {
|
||||
this.person = person;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "HiddenDanger{" +
|
||||
"id=" + id +
|
||||
", name='" + name + '\'' +
|
||||
", details='" + details + '\'' +
|
||||
", riskId=" + riskId +
|
||||
", riskName='" + riskName + '\'' +
|
||||
", submitDate=" + submitDate +
|
||||
", submitPersonId=" + submitPersonId +
|
||||
", submitEnterpriseId=" + submitEnterpriseId +
|
||||
", reformMeasures='" + reformMeasures + '\'' +
|
||||
", reformStatus='" + reformStatus + '\'' +
|
||||
", exceedTimeLimitStatus=" + exceedTimeLimitStatus +
|
||||
", enterpriseId=" + enterpriseId +
|
||||
", enterprise='" + enterprise + '\'' +
|
||||
", personId=" + personId +
|
||||
", person='" + person + '\'' +
|
||||
", remarks='" + remarks + '\'' +
|
||||
", rectificationPeriod='" + rectificationPeriod + '\'' +
|
||||
'}';
|
||||
}
|
||||
/** 排查人员 */
|
||||
@ApiModelProperty(value = "排查人员")
|
||||
private String investigator;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,11 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
select distinct(a.id) id, a.name, a.details, a.risk_id riskId, a.submit_date submitDate, a.reform_measures reformMeasures, a.reform_status reformStatus, a.exceed_time_limit_status exceedTimeLimitStatus, a.enterprise_id enterpriseId, a.person_id personId, a.remarks remarks, a.rectification_period rectificationPeriod,
|
||||
b.name as enterprise,
|
||||
p.name as person,
|
||||
r.name as riskName
|
||||
r.name as riskName,
|
||||
a.investigator_id investigatorId,
|
||||
n.name investigator
|
||||
from hidden_danger as a
|
||||
left join enterprise_information as b on a.enterprise_id = b.id
|
||||
left join person as p on a.person_id = p.id
|
||||
left join risk as r on a.risk_id = r.id
|
||||
left join person as n on a.investigator_id = n.id
|
||||
</sql>
|
||||
|
||||
<select id="selectHiddenDangerById" parameterType="Integer" resultType="HiddenDanger">
|
||||
|
|
|
|||
Loading…
Reference in New Issue