From fb78cde15440647655cc362b8425cd72f0a9f070 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 5 Jul 2024 18:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BA=BA=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=8A=B3=E5=8A=A1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...XzDangerousEngineeringAcceptanceMapper.xml | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml index 30e3fe171..0e5b071d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml @@ -7,13 +7,14 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName + wi1.worker_name as acceptanceUserName from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id left join enterprise_info ei2 on ei2.id = xdea.apply_acceptance_unit_id left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id ${ew.customSqlSegment} @@ -24,7 +25,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -32,6 +33,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_blind_plate_plug_safe x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=4 @@ -41,7 +43,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -49,6 +51,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_ground_safet x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=8 @@ -58,7 +61,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -66,6 +69,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_high_job_safe x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=5 @@ -75,7 +79,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -83,6 +87,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_hoist_safety_work x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=6 @@ -92,7 +97,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -100,6 +105,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_limit_space_safe x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=3 @@ -109,7 +115,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -117,6 +123,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_open_circuit_safe x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=9 @@ -126,7 +133,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -134,6 +141,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_special_operation_fire_safety x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=2 @@ -143,7 +151,7 @@ ei2.enterprise_name as applyAcceptanceUnitName, ei1.enterprise_name as acceptanceUnitName, su1.real_name as applyAcceptanceUserName, - su2.real_name as acceptanceUserName, + wi1.worker_name as acceptanceUserName, ei3.enterprise_name as job_application_unit_name from xz_dangerous_engineering_acceptance xdea left join dangerous_engineering_record depr on xdea.engineering_id = depr.id @@ -151,6 +159,7 @@ left join enterprise_info ei1 on ei1.id = xdea.acceptance_unit_id left join system_user su1 on su1.user_id = xdea.apply_acceptance_user_id left join system_user su2 on su2.user_id = xdea.acceptance_user_id + left join worker_info wi1 on wi1.id = su2.worker_id join xz_temporary_electricity_safe x on x.id=xdea.engineering_id join enterprise_info ei3 on ei3.id= x.job_application_unit where xdea.project_sn=#{param.projectSn} and xdea.type=7