admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

特种作业的人直接存名字

Browse Source
This commit is contained in:
GUO 2024-05-16 23:07:44 +08:00
parent 914ae9fb42
commit d7a2658a61
14 changed files with 252 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java
View File

@ -53,43 +53,12 @@ public class XzBlindPlatePlugSafe implements Serializable {
@ApiModelProperty(value = "实际作业开始时间")
private java.util.Date actualJobBeginTime;
/**
* 作业人
*/
@Excel(name = "作业人", width = 15)
@ApiModelProperty(value = "作业人")
private Long jobPerson;
/**
* 作业单位
*/
@Excel(name = "作业单位", width = 15)
@ApiModelProperty(value = "作业单位")
private Long operatingUnit;
/**
* 作业负责人
*/
@Excel(name = "作业负责人", width = 15)
@ApiModelProperty(value = "作业负责人")
private Long assignmentPersonInCharge;
/**
* 安全交底人
*/
@Excel(name = "安全交底人", width = 15)
@ApiModelProperty(value = "安全交底人")
private Long safetyInformant;
/**
* 接受交底人
*/
@Excel(name = "接受交底人", width = 15)
@ApiModelProperty(value = "接受交底人")
private Long acceptTheInformant;
/**
* 监护人
*/
@Excel(name = "监护人", width = 15)
@ApiModelProperty(value = "监护人")
private Long guardian;
/**
* 风险辨识结果
*/
@ -184,6 +153,41 @@ public class XzBlindPlatePlugSafe implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "编制人日期")
private java.util.Date organizerDate;
/**
* 作业负责人名称
*/
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
/**
* 作业申请单位名称
*/
@ -199,45 +203,6 @@ public class XzBlindPlatePlugSafe implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private String operatingUnitName;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@TableField(exist = false)
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@TableField(exist = false)
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@TableField(exist = false)
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@TableField(exist = false)
@ApiModelProperty(value = "安全隐患总数")

97
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -73,30 +72,6 @@ public class XzGroundSafet implements Serializable {
@Excel(name = "作业单位", width = 15)
@ApiModelProperty(value = "作业单位")
private Long operatingUnit;
/**
* 作业负责人
*/
@Excel(name = "作业负责人", width = 15)
@ApiModelProperty(value = "作业负责人")
private Long assignmentPersonInCharge;
/**
* 安全交底人
*/
@Excel(name = "安全交底人", width = 15)
@ApiModelProperty(value = "安全交底人")
private Long safetyInformant;
/**
* 接受交底人
*/
@Excel(name = "接受交底人", width = 15)
@ApiModelProperty(value = "接受交底人")
private Long acceptTheInformant;
/**
* 监护人
*/
@Excel(name = "监护人", width = 15)
@ApiModelProperty(value = "监护人")
private Long guardian;
/**
* 风险辨识结果
*/
@ -162,6 +137,40 @@ public class XzGroundSafet implements Serializable {
@ApiModelProperty(value = "最终验收状态1进行中2已闭合")
private Integer finalAcceptanceStatus;
/**
* 作业负责人名称
*/
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
/**
* 作业申请单位名称
*/
@ -177,44 +186,6 @@ public class XzGroundSafet implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private String operatingUnitName;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@TableField(exist = false)
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@TableField(exist = false)
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@TableField(exist = false)
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@TableField(exist = false)

105
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -59,12 +58,6 @@ public class XzHighJobSafe implements Serializable {
@Excel(name = "作业高度", width = 15)
@ApiModelProperty(value = "作业高度")
private String jobHigh;
/**
* 作业人
*/
@Excel(name = "作业人", width = 15)
@ApiModelProperty(value = "作业人")
private Long jobPerson;
/**
* 作业单位
@ -72,30 +65,6 @@ public class XzHighJobSafe implements Serializable {
@Excel(name = "作业单位", width = 15)
@ApiModelProperty(value = "作业单位")
private Long operatingUnit;
/**
* 作业负责人
*/
@Excel(name = "作业负责人", width = 15)
@ApiModelProperty(value = "作业负责人")
private Long assignmentPersonInCharge;
/**
* 安全交底人
*/
@Excel(name = "安全交底人", width = 15)
@ApiModelProperty(value = "安全交底人")
private Long safetyInformant;
/**
* 接受交底人
*/
@Excel(name = "接受交底人", width = 15)
@ApiModelProperty(value = "接受交底人")
private Long acceptTheInformant;
/**
* 监护人
*/
@Excel(name = "监护人", width = 15)
@ApiModelProperty(value = "监护人")
private Long guardian;
/**
* 风险辨识结果
*/
@ -161,6 +130,41 @@ public class XzHighJobSafe implements Serializable {
@ApiModelProperty(value = "最终验收状态1进行中2已闭合")
private Integer finalAcceptanceStatus;
/**
* 作业负责人名称
*/
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
/**
* 作业申请单位名称
*/
@ -176,45 +180,6 @@ public class XzHighJobSafe implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private String operatingUnitName;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@TableField(exist = false)
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@TableField(exist = false)
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@TableField(exist = false)
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@TableField(exist = false)
@ApiModelProperty(value = "安全隐患总数")

107
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -53,24 +52,6 @@ public class XzHoistSafetyWork implements Serializable {
@Excel(name = "作业单位", width = 15)
@ApiModelProperty(value = "作业单位")
private Long operatingUnit;
/**
* 安全交底人
*/
@Excel(name = "安全交底人", width = 15)
@ApiModelProperty(value = "安全交底人")
private Long safetyInformant;
/**
* 接受交底人
*/
@Excel(name = "接受交底人", width = 15)
@ApiModelProperty(value = "接受交底人")
private Long acceptTheInformant;
/**
* 监护人
*/
@Excel(name = "监护人", width = 15)
@ApiModelProperty(value = "监护人")
private Long guardian;
/**
* 风险辨识结果
*/
@ -159,27 +140,48 @@ public class XzHoistSafetyWork implements Serializable {
private String workTicketCode;
@ApiModelProperty(value = "最终验收状态1进行中2已闭合")
private Integer finalAcceptanceStatus;
/**
* 司索人
*/
@Excel(name = "司索人", width = 15)
@ApiModelProperty(value = "司索人")
private Long siSuoPerson;
/**
* 作业负责人
*/
@Excel(name = "作业负责人", width = 15)
@ApiModelProperty(value = "作业负责人")
private java.lang.Long assignmentPersonInCharge;
@ApiModelProperty(value = "吊装作业人")
private Long hoistJobPerson;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private java.lang.String assignmentPersonInChargeName;
/**
* 吊装作业人名称
*/
@Excel(name = "吊装作业人名称", width = 15)
@ApiModelProperty(value = "吊装作业人名称")
private String hoistJobPersonName;
/**
* 监护人名称
*/
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@Excel(name = "司索人名称", width = 15)
@ApiModelProperty(value = "司索人名称")
private String siSuoPersonName;
@ApiModelProperty(value = "指挥人员名称")
private String commanderName;
/**
* 作业申请单位名称
*/
@ -195,41 +197,6 @@ public class XzHoistSafetyWork implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private String operatingUnitName;
/**
* 吊装作业人名称
*/
@TableField(exist = false)
@Excel(name = "吊装作业人名称", width = 15)
@ApiModelProperty(value = "吊装作业人名称")
private String hoistJobPersonName;
/**
* 监护人名称
*/
@TableField(exist = false)
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@TableField(exist = false)
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@TableField(exist = false)
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@TableField(exist = false)
@Excel(name = "司索人名称", width = 15)
@ApiModelProperty(value = "司索人名称")
private String siSuoPersonName;
@TableField(exist = false)
@ApiModelProperty(value = "安全隐患总数")
@ -244,6 +211,4 @@ public class XzHoistSafetyWork implements Serializable {
@ApiModelProperty(value = "1未开始，2进行中（在施），3超期，4已完工")
private Integer engineeringState;
@ApiModelProperty(value = "指挥人员名称")
private String commanderName;
}

81
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -59,12 +58,6 @@ public class XzLimitSpaceSafe implements Serializable {
@Excel(name = "受限空间内原有介质名称", width = 15)
@ApiModelProperty(value = "受限空间内原有介质名称")
private String limitSpaceMediumName;
/**
* 作业人
*/
@Excel(name = "作业人", width = 15)
@ApiModelProperty(value = "作业人")
private Long jobPerson;
/**
* 作业单位
@ -166,6 +159,41 @@ public class XzLimitSpaceSafe implements Serializable {
private java.util.Date workExecutionEndTime;
@ApiModelProperty(value = "其他安全措施")
private String otherSafeMeasure;
/**
* 作业负责人名称
*/
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private java.lang.String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private java.lang.String guardianName;
/**
* 安全交底人名称
*/
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private java.lang.String safetyInformantName;
/**
* 接受交底人名称
*/
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private java.lang.String acceptTheInformantName;
/**
* 作业申请单位名称
*/
@ -181,45 +209,6 @@ public class XzLimitSpaceSafe implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private java.lang.String operatingUnitName;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private java.lang.String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@TableField(exist = false)
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private java.lang.String guardianName;
/**
* 安全交底人名称
*/
@TableField(exist = false)
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private java.lang.String safetyInformantName;
/**
* 接受交底人名称
*/
@TableField(exist = false)
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private java.lang.String acceptTheInformantName;
@TableField(exist = false)
@ApiModelProperty(value = "安全隐患总数")

103
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -64,13 +63,13 @@ public class XzOpenCircuitSafe implements Serializable {
*/
@Excel(name = "断路地段示意图", width = 15)
@ApiModelProperty(value = "断路地段示意图")
private Long breakLocationDiagram;
private String breakLocationDiagram;
/**
* 断路地段相关说明
*/
@Excel(name = "断路地段相关说明", width = 15)
@ApiModelProperty(value = "断路地段相关说明")
private Long breakLocationDescription;
private String breakLocationDescription;
/**
* 作业单位
@ -78,30 +77,6 @@ public class XzOpenCircuitSafe implements Serializable {
@Excel(name = "作业单位", width = 15)
@ApiModelProperty(value = "作业单位")
private Long operatingUnit;
/**
* 作业负责人
*/
@Excel(name = "作业负责人", width = 15)
@ApiModelProperty(value = "作业负责人")
private Long assignmentPersonInCharge;
/**
* 安全交底人
*/
@Excel(name = "安全交底人", width = 15)
@ApiModelProperty(value = "安全交底人")
private Long safetyInformant;
/**
* 接受交底人
*/
@Excel(name = "接受交底人", width = 15)
@ApiModelProperty(value = "接受交底人")
private Long acceptTheInformant;
/**
* 监护人
*/
@Excel(name = "监护人", width = 15)
@ApiModelProperty(value = "监护人")
private Long guardian;
/**
* 风险辨识结果
*/
@ -167,6 +142,42 @@ public class XzOpenCircuitSafe implements Serializable {
@ApiModelProperty(value = "最终验收状态1进行中2已闭合")
private Integer finalAcceptanceStatus;
/**
* 作业人名称
*/
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
/**
* 作业负责人名称
*/
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业申请单位名称
*/
@ -182,44 +193,6 @@ public class XzOpenCircuitSafe implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private String operatingUnitName;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@TableField(exist = false)
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@TableField(exist = false)
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@TableField(exist = false)
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@TableField(exist = false)

117
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -59,12 +58,6 @@ public class XzTemporaryElectricitySafe implements Serializable {
@Excel(name = "电源接入点", width = 15)
@ApiModelProperty(value = "电源接入点")
private String powerAccessPoint;
/**
* 作业人
*/
@Excel(name = "作业人", width = 15)
@ApiModelProperty(value = "作业人")
private Long jobPerson;
/**
* 作业单位
@ -72,30 +65,6 @@ public class XzTemporaryElectricitySafe implements Serializable {
@Excel(name = "作业单位", width = 15)
@ApiModelProperty(value = "作业单位")
private Long operatingUnit;
/**
* 作业负责人
*/
@Excel(name = "作业负责人", width = 15)
@ApiModelProperty(value = "作业负责人")
private Long assignmentPersonInCharge;
/**
* 安全交底人
*/
@Excel(name = "安全交底人", width = 15)
@ApiModelProperty(value = "安全交底人")
private Long safetyInformant;
/**
* 接受交底人
*/
@Excel(name = "接受交底人", width = 15)
@ApiModelProperty(value = "接受交底人")
private Long acceptTheInformant;
/**
* 监护人
*/
@Excel(name = "监护人", width = 15)
@ApiModelProperty(value = "监护人")
private Long guardian;
/**
* 风险辨识结果
*/
@ -138,13 +107,6 @@ public class XzTemporaryElectricitySafe implements Serializable {
@Excel(name = "额度功率", width = 15)
@ApiModelProperty(value = "额度功率")
private String ratedPower;
/**
* 用电人
*/
@Excel(name = "用电人", width = 15)
@ApiModelProperty(value = "用电人")
private Long electricityCustomer;
/**
* 电工证号1
*/
@ -218,6 +180,44 @@ public class XzTemporaryElectricitySafe implements Serializable {
private Integer finalAcceptanceStatus;
@ApiModelProperty(value = "可燃气体分析(分析时间和可燃气体检测结果）")
private String combustibleGasAnalysis;
/**
* 作业负责人名称
*/
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@ApiModelProperty(value = "用电人名称")
private String electricityCustomerName;
/**
* 作业申请单位名称
*/
@ -233,47 +233,6 @@ public class XzTemporaryElectricitySafe implements Serializable {
@ApiModelProperty(value = "作业单位名称")
private String operatingUnitName;
/**
* 作业负责人名称
*/
@TableField(exist = false)
@Excel(name = "作业负责人名称", width = 15)
@ApiModelProperty(value = "作业负责人名称")
private String assignmentPersonInChargeName;
/**
* 作业人名称
*/
@TableField(exist = false)
@Excel(name = "作业人名称", width = 15)
@ApiModelProperty(value = "作业人名称")
private String jobPersonName;
/**
* 监护人名称
*/
@TableField(exist = false)
@Excel(name = "监护人名称", width = 15)
@ApiModelProperty(value = "监护人名称")
private String guardianName;
/**
* 安全交底人名称
*/
@TableField(exist = false)
@Excel(name = "安全交底人名称", width = 15)
@ApiModelProperty(value = "安全交底人名称")
private String safetyInformantName;
/**
* 接受交底人名称
*/
@TableField(exist = false)
@Excel(name = "接受交底人名称", width = 15)
@ApiModelProperty(value = "接受交底人名称")
private String acceptTheInformantName;
@ApiModelProperty(value = "用电人名称")
private String electricityCustomerName;
@TableField(exist = false)
@ApiModelProperty(value = "安全隐患总数")

10
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml
View File

@ -5,11 +5,6 @@
t.*,
ei1.enterprise_name as jobApplicationUnitName,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi1.worker_name as jobPersonName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
(case
when t.final_acceptance_status = 2 then 4
@ -30,11 +25,6 @@
from xz_blind_plate_plug_safe t
left join enterprise_info ei1 on t.job_application_unit = ei1.id
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi1 on t.job_person = wi1.id
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id
LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
from xz_security_quality_inspection_record
WHERE 1 = 1

8
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml
View File

@ -4,10 +4,6 @@
<sql id="column">
t.*,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
(case
when t.final_acceptance_status = 2 then 4
@ -27,10 +23,6 @@
<include refid="column"/>
from xz_ground_safet t
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id
LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
from xz_security_quality_inspection_record
WHERE 1 = 1

11
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml
View File

@ -5,11 +5,6 @@
t.*,
ei1.enterprise_name as jobApplicationUnitName,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi1.worker_name as jobPersonName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
(case
when t.final_acceptance_status = 2 then 4
@ -30,11 +25,7 @@
from xz_high_job_safe t
left join enterprise_info ei1 on t.job_application_unit = ei1.id
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi1 on t.job_person = wi1.id
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id
LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
from xz_security_quality_inspection_record
WHERE 1 = 1

13
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml
View File

@ -5,12 +5,6 @@
t.*,
ei1.enterprise_name as jobApplicationUnitName,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi5.worker_name as siSuoPersonName,
wi6.worker_name as hoistJobPersonName,
wi7.worker_name as commanderName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
(case
when t.final_acceptance_status = 2 then 4
@ -31,13 +25,6 @@
from xz_hoist_safety_work t
left join enterprise_info ei1 on t.job_application_unit = ei1.id
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id
left join worker_info wi5 on t.si_suo_person = wi5.id
left join worker_info wi6 on t.hoist_job_person = wi6.id
left join worker_info wi7 on t.commander = wi7.id
LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
from xz_security_quality_inspection_record
WHERE 1 = 1

10
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzLimitSpaceSafeMapper.xml
View File

@ -5,11 +5,6 @@
t.*,
ei1.enterprise_name as jobApplicationUnitName,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi1.worker_name as jobPersonName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
(case
when t.final_acceptance_status = 2 then 4
@ -30,11 +25,6 @@
from xz_limit_space_safe t
left join enterprise_info ei1 on t.job_application_unit = ei1.id
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi1 on t.job_person = wi1.id
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id
LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
from xz_security_quality_inspection_record
WHERE 1 = 1

8
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml
View File

@ -5,10 +5,6 @@
t.*,
ei1.enterprise_name as jobApplicationUnitName,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
(case
when t.final_acceptance_status = 2 then 4
@ -29,10 +25,6 @@
from xz_open_circuit_safe t
left join enterprise_info ei1 on t.job_application_unit = ei1.id
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id
LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
from xz_security_quality_inspection_record
WHERE 1 = 1

12
src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml
View File

@ -4,12 +4,6 @@
<sql id="column">
t.*,
ei2.enterprise_name as operatingUnitName,
su.real_name as assignmentPersonInChargeName,
wi1.worker_name as jobPersonName,
wi2.worker_name as safetyInformantName,
wi3.worker_name as acceptTheInformantName,
wi4.worker_name as guardianName,
wi5.worker_name as electricityCustomerName,
IFNULL(tp.hidden_danger_num, 0) hidden_danger_num,
(case
when t.final_acceptance_status = 2 then 4
@ -29,12 +23,6 @@
<include refid="column"/>
from xz_temporary_electricity_safe t
left join enterprise_info ei2 on t.operating_unit = ei2.id
left join system_user su on su.user_id=t.assignment_person_in_charge
left join worker_info wi1 on t.job_person = wi1.id
left join worker_info wi2 on t.safety_informant = wi2.id
left join worker_info wi3 on t.accept_the_informant = wi3.id
left join worker_info wi4 on t.guardian = wi4.id
left join worker_info wi5 on t.electricity_customer = wi5.id
LEFT JOIN (SELECT engineering_id, COUNT(1) hidden_danger_num
from xz_security_quality_inspection_record
where 1=1