From 2c4e495d245ac336ead2981fe69d80f5b58160c2 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 5 Sep 2024 15:01:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3sql=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapping/LabReportBasisDataMapping.xml | 30 +++++++++---------- .../base/mapping/DictionnaireDetailMapper.xml | 6 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/LabReportBasisDataMapping.xml b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/LabReportBasisDataMapping.xml index e61c15d..8192abf 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/LabReportBasisDataMapping.xml +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/LabReportBasisDataMapping.xml @@ -38,8 +38,8 @@ LEFT JOIN x_r_master_data B ON A.m_id = B.id LEFT JOIN x_lab_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id - LEFT JOIN busi_site_tree F on b.equ_little_type = F.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id + LEFT JOIN busi_site_tree F on B.equ_little_type = F.id LEFT JOIN x_lab_report_mark_statistic G ON G.param_id = C.id WHERE A.`deleted` = #{deleted} @@ -165,8 +165,8 @@ LEFT JOIN x_r_arrester_data B ON A.m_id = B.id LEFT JOIN x_lab_arrester_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id - LEFT JOIN busi_site_tree F on b.equ_little_type = F.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id + LEFT JOIN busi_site_tree F on B.equ_little_type = F.id LEFT JOIN x_lab_arrester_report_mark_statistic G ON G.param_id = C.id WHERE A.`deleted` = #{deleted} @@ -292,8 +292,8 @@ LEFT JOIN x_r_cable_data B ON A.m_id = B.id LEFT JOIN x_lab_cable_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id - LEFT JOIN busi_site_tree F on b.equ_little_type = F.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id + LEFT JOIN busi_site_tree F on B.equ_little_type = F.id LEFT JOIN x_lab_cable_report_mark_statistic G ON G.param_id = C.id WHERE A.`deleted` = #{deleted} @@ -419,8 +419,8 @@ LEFT JOIN x_r_switchgear_data B ON A.m_id = B.id LEFT JOIN x_lab_switchgear_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id - LEFT JOIN busi_site_tree F on b.equ_little_type = F.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id + LEFT JOIN busi_site_tree F on B.equ_little_type = F.id LEFT JOIN x_lab_switchgear_report_mark_statistic G ON G.param_id = C.id WHERE A.`deleted` = #{deleted} @@ -546,8 +546,8 @@ LEFT JOIN x_r_generator_data B ON A.m_id = B.id LEFT JOIN x_lab_generator_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id - LEFT JOIN busi_site_tree F on b.equ_little_type = F.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id + LEFT JOIN busi_site_tree F on B.equ_little_type = F.id LEFT JOIN x_lab_generator_report_mark_statistic G ON G.param_id = C.id WHERE A.`deleted` = #{deleted} @@ -649,7 +649,7 @@ LEFT JOIN x_r_master_data B ON A.m_id = B.id LEFT JOIN x_lab_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id WHERE A.deleted = #{deleted} AND B.deleted = #{deleted} @@ -692,7 +692,7 @@ LEFT JOIN x_r_arrester_data B ON A.m_id = B.id LEFT JOIN x_lab_arrester_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id WHERE A.deleted = #{deleted} AND B.deleted = #{deleted} @@ -735,7 +735,7 @@ LEFT JOIN x_r_cable_data B ON A.m_id = B.id LEFT JOIN x_lab_cable_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id WHERE A.deleted = #{deleted} AND B.deleted = #{deleted} @@ -778,7 +778,7 @@ LEFT JOIN x_r_switchgear_data B ON A.m_id = B.id LEFT JOIN x_lab_switchgear_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id WHERE A.deleted = #{deleted} AND B.deleted = #{deleted} @@ -821,7 +821,7 @@ LEFT JOIN x_r_generator_data B ON A.m_id = B.id LEFT JOIN x_lab_generator_report_param_data C ON A.id = C.r_id LEFT JOIN sys_file D ON A.ref_id = D.business_id - LEFT JOIN busi_site_tree E on b.equ_little_id = E.id + LEFT JOIN busi_site_tree E on B.equ_little_id = E.id WHERE A.deleted = #{deleted} AND B.deleted = #{deleted} diff --git a/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/mapping/DictionnaireDetailMapper.xml b/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/mapping/DictionnaireDetailMapper.xml index dd29af1..9fbd69e 100644 --- a/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/mapping/DictionnaireDetailMapper.xml +++ b/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/mapping/DictionnaireDetailMapper.xml @@ -97,8 +97,8 @@ SELECT - a.dname + A.dname FROM sys_dictionnaire_detail A LEFT JOIN sys_dictionnaire B ON A.pid = B.id