diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java index 2503f3c9b..7a5e201e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java @@ -36,6 +36,11 @@ public class XzBlindPlatePlugSafe implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业申请时间 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java index 358d7d9e5..df466b490 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGasAnalyze.java @@ -1,18 +1,16 @@ package com.zhgd.xmgl.modules.xz.special.entity; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: 星纵-气体分析 @@ -24,57 +22,57 @@ import io.swagger.annotations.ApiModelProperty; @TableName("xz_gas_analyze") @ApiModel(value = "XzGasAnalyze实体类", description = "XzGasAnalyze") public class XzGasAnalyze implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * id - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.Long id; - @ApiModelProperty(value = "星纵-特种作业-动火安全id") - private java.lang.Long xzSpecialOperationFireSafetyId; - /** - * 所属项目SN - */ - @Excel(name = "所属项目SN", width = 15) - @ApiModelProperty(value = "所属项目SN") - private java.lang.String projectSn; - /** - * 气体取样分析时间 - */ - @Excel(name = "气体取样分析时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "气体取样分析时间") - private java.util.Date gasAnalyzeTime; - /** - * 代表性气体 - */ - @Excel(name = "代表性气体", width = 15) - @ApiModelProperty(value = "代表性气体") - private java.lang.String representativeGas; - /** - * 分析结果/% - */ - @Excel(name = "分析结果/%", width = 15) - @ApiModelProperty(value = "分析结果/%") - private java.lang.String analyzeResult; - /** - * 分析人 - */ - @Excel(name = "分析人", width = 15) - @ApiModelProperty(value = "分析人") - private java.lang.String analyzer; - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - private java.util.Date createDate; - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - private java.util.Date updateDate; + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + @ApiModelProperty(value = "星纵-特种作业-动火安全id") + private java.lang.Long xzSpecialOperationFireSafetyId; + /** + * 所属项目SN + */ + @Excel(name = "所属项目SN", width = 15) + @ApiModelProperty(value = "所属项目SN") + private java.lang.String projectSn; + /** + * 气体取样分析时间 + */ + @Excel(name = "气体取样分析时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "气体取样分析时间") + private java.util.Date gasAnalyzeTime; + /** + * 代表性气体 + */ + @Excel(name = "代表性气体", width = 15) + @ApiModelProperty(value = "代表性气体") + private java.lang.String representativeGas; + /** + * 分析结果/% + */ + @Excel(name = "分析结果/%", width = 15) + @ApiModelProperty(value = "分析结果/%") + private java.lang.String analyzeResult; + /** + * 分析人 + */ + @Excel(name = "分析人", width = 15) + @ApiModelProperty(value = "分析人") + private java.lang.String analyzer; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private java.util.Date createDate; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private java.util.Date updateDate; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java index c60ad74df..316405e07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzGroundSafet.java @@ -37,6 +37,11 @@ public class XzGroundSafet implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业申请时间 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java index 11e3d9f2e..4b028fc3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHighJobSafe.java @@ -37,6 +37,11 @@ public class XzHighJobSafe implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业申请时间 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java index 24228b445..9e34aa50b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzHoistSafetyWork.java @@ -37,6 +37,11 @@ public class XzHoistSafetyWork implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业申请时间 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java index 3f9e44a0b..cc23a2eda 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzLimitSpaceSafe.java @@ -37,6 +37,11 @@ public class XzLimitSpaceSafe implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private java.lang.Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业申请时间 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java index e401d1012..dfe780525 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzOpenCircuitSafe.java @@ -37,6 +37,11 @@ public class XzOpenCircuitSafe implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业申请时间 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java index 72c6851e1..c86ba0291 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzSpecialOperationFireSafety.java @@ -38,6 +38,11 @@ public class XzSpecialOperationFireSafety implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private java.lang.Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业单位 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java index f8c10c619..72f0bec59 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzTemporaryElectricitySafe.java @@ -37,6 +37,11 @@ public class XzTemporaryElectricitySafe implements Serializable { @Excel(name = "作业申请单位", width = 15) @ApiModelProperty(value = "作业申请单位") private Long jobApplicationUnit; + @ApiModelProperty(value = "现场作业环境") + private String fieldWorkingEnvironment; + @ApiModelProperty(value = "安全技术交底") + private String safetyAndTechnologyDisclosure; + /** * 作业申请时间 */