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

特种作业的mapper修改

Browse Source
This commit is contained in:
guoshengxiong 2024-05-15 20:55:32 +08:00
parent 9470a7913f
commit d32717d8f8
7 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
/**
* 作业申请单位名称
*/

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

@ -15,7 +15,7 @@
<sql id="selectTable">
select
<include refid="column"/>
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

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

@ -3,7 +3,6 @@
<mapper namespace="com.zhgd.xmgl.modules.xz.special.mapper.XzGroundSafetMapper">
<sql id="column">
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 @@
<sql id="selectTable">
select
<include refid="column"/>
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

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

@ -15,7 +15,7 @@
<sql id="selectTable">
select
<include refid="column"/>
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

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

@ -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 @@
<sql id="selectTable">
select
<include refid="column"/>
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

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

@ -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 @@
<sql id="selectTable">
select
<include refid="column"/>
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

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

@ -3,7 +3,6 @@
<mapper namespace="com.zhgd.xmgl.modules.xz.special.mapper.XzTemporaryElectricitySafeMapper">
<sql id="column">
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 @@
<sql id="selectTable">
select
<include refid="column"/>
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