From 32cffdccf5e23a0df164994863785e0a0da8c35d Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 12 Dec 2022 17:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=89=B9=E9=87=8F=E5=87=8F?= =?UTF-8?q?=E5=91=98=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=87=8F=E5=91=98=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=85=B3=E6=B3=A8=E6=9C=80=E7=BB=88=E7=BC=B4?= =?UTF-8?q?=E7=BA=B3=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/siarchives/InsuranceBaseInfoMapper.xml | 12 ++++++------ .../salary/service/impl/SIArchivesServiceImpl.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml index 4537304e0..1f003ba57 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml @@ -214,14 +214,14 @@ SELECT FROM hrsa_insurance_base_info t - LEFT JOIN( SELECT social.payment_organization, social.employee_id, social.social_end_time FROM hrsa_social_archives social WHERE social.delete_type = 0 )social ON t.employee_id = social.employee_id AND t.payment_organization = social.payment_organization - LEFT JOIN( SELECT fund.payment_organization, fund.employee_id, fund.fund_end_time FROM hrsa_fund_archives fund WHERE fund.delete_type = 0 )fund ON t.employee_id = fund.employee_id AND t.payment_organization = fund.payment_organization - LEFT JOIN( SELECT other.payment_organization, other.employee_id, other.other_end_time FROM hrsa_other_archives other WHERE other.delete_type = 0 )other ON t.employee_id = other.employee_id AND t.payment_organization = other.payment_organization + LEFT JOIN( SELECT social.payment_organization, social.employee_id, social.social_end_time, social.social_scheme_id FROM hrsa_social_archives social WHERE social.delete_type = 0 )social ON t.employee_id = social.employee_id AND t.payment_organization = social.payment_organization + LEFT JOIN( SELECT fund.payment_organization, fund.employee_id, fund.fund_end_time, fund.fund_scheme_id FROM hrsa_fund_archives fund WHERE fund.delete_type = 0 )fund ON t.employee_id = fund.employee_id AND t.payment_organization = fund.payment_organization + LEFT JOIN( SELECT other.payment_organization, other.employee_id, other.other_end_time, other.other_scheme_id FROM hrsa_other_archives other WHERE other.delete_type = 0 )other ON t.employee_id = other.employee_id AND t.payment_organization = other.payment_organization WHERE t.delete_type = 0 AND t.run_status = '2' - AND social.social_end_time is not null and social.social_end_time ]]> ' ' and social.social_end_time #{today} - AND fund.fund_end_time is not null and fund.fund_end_time ]]> ' ' and fund.fund_end_time #{today} - AND other.other_end_time is not null and other.other_end_time ]]> ' ' and other.other_end_time #{today} + AND (social.social_scheme_id is null or (social.social_end_time is not null and social.social_end_time ]]> ' ' and social.social_end_time #{today})) + AND (fund.fund_scheme_id is null or (fund.fund_end_time is not null and fund.fund_end_time ]]> ' ' and fund.fund_end_time #{today})) + AND (other.other_scheme_id is null or (other.other_end_time is not null and other.other_end_time ]]> ' ' and other.other_end_time #{today}))