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 0f405c3c9..fd5fecfc7 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 @@ -120,22 +120,6 @@ public class XzLimitSpaceSafe implements Serializable { @Excel(name = "关联的其他特殊作业", width = 15) @ApiModelProperty(value = "关联的其他特殊作业") private java.lang.String otherRelatedSpecialTask; - /** - * 动火作业实施时间开始 - */ - @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 hotWorkExecutionBeginTime; - /** - * 动火作业实施时间结束 - */ - @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 hotWorkExecutionEndTime; /** * 所属项目SN */ @@ -164,7 +148,22 @@ public class XzLimitSpaceSafe implements Serializable { private java.lang.String combustibleGasInformation; @ApiModelProperty(value = "气体分析数据") private java.lang.String gasAnalysisData; - + /** + * 作业实施时间开始 + */ + @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 workExecutionBeginTime; + /** + * 作业实施时间结束 + */ + @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 workExecutionEndTime; /** * 作业申请单位名称 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml index fda126dc2..41af5e4e9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzBlindPlatePlugSafeMapper.xml @@ -15,7 +15,7 @@ select - from xz_limit_space_safe t + 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 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml index 4f8e2faa0..aadc39269 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzGroundSafetMapper.xml @@ -3,7 +3,6 @@ t.*, - ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, su.real_name as assignmentPersonInChargeName, wi1.worker_name as jobPersonName, @@ -15,11 +14,9 @@ select - from xz_limit_space_safe t - left join enterprise_info ei1 on t.job_application_unit = ei1.id + 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 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 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml index 5bf80937c..f3835912c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHighJobSafeMapper.xml @@ -15,7 +15,7 @@ select - from xz_limit_space_safe t + 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 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml index d41716947..f9bb950a8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzHoistSafetyWorkMapper.xml @@ -5,8 +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, @@ -15,11 +13,9 @@ select - from xz_limit_space_safe t + 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 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 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml index 6a4e7d357..67d599c0d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzOpenCircuitSafeMapper.xml @@ -6,7 +6,6 @@ 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, @@ -15,11 +14,10 @@ select - from xz_limit_space_safe t + 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 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 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml index eec293905..c2a1a7153 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/mapper/xml/XzTemporaryElectricitySafeMapper.xml @@ -3,7 +3,6 @@ t.*, - ei1.enterprise_name as jobApplicationUnitName, ei2.enterprise_name as operatingUnitName, su.real_name as assignmentPersonInChargeName, wi1.worker_name as jobPersonName, @@ -15,8 +14,7 @@ select - from xz_limit_space_safe t - left join enterprise_info ei1 on t.job_application_unit = ei1.id + 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