From aacecc0c135c828c9b04172eb980983ca4de8ba7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 8 Aug 2024 11:44:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=B3=E4=BE=A7=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E8=BF=94=E5=9B=9E=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/mapper/xml/LawsCommonMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index 1ec3a68e..d02fce6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -56,19 +56,20 @@ select * from ( SELECT standard.id, standard.standard_number, standard.standard_name, standard.implementation_date, standard.standard_state, standard.source, standard.create_time, - standard.new_product_impl_date, standard.new_auth_impl_date, standard.create_by, standard.responsible_user + standard.new_product_impl_date, standard.new_auth_impl_date, standard.create_by, standard.responsible_user, + standard.release_date , split.id AS split_info_id FROM - (SELECT id, standard_number, standard_name, implementation_date, standard_state, '1' AS source, create_time, + (SELECT id, standard_number, standard_name, implementation_date, null as release_date, standard_state, '1' AS source, create_time, new_product_impl_date, new_auth_impl_date, create_by, responsible_user FROM laws_domestic_standard WHERE del_flag = 0 UNION ALL - SELECT id, standard_number, standard_name, release_date, standard_state as es_standard_state, '3' AS source, create_time, + SELECT id, standard_number, standard_name, null as implementation_date, release_date, standard_state as es_standard_state, '3' AS source, create_time, null as new_product_impl_date, null as new_auth_impl_date, create_by, null as responsible_user FROM laws_enterprise_standard WHERE del_flag = 0) standard