From 3657abe41b7bd4d6a218e4aa522b4c11e5195bb0 Mon Sep 17 00:00:00 2001 From: sy Date: Sun, 25 Jun 2023 17:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-pg?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=82=E9=85=8D=EF=BC=8C=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=E7=8A=B6=E6=80=81=E5=8F=98=E6=8D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/siarchives/InsuranceBaseInfoMapper.java | 2 -- .../mapper/siarchives/InsuranceBaseInfoMapper.xml | 12 ++++++------ .../salary/service/impl/SISchemeServiceImpl.java | 12 ++++++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java index 02e63cfe5..7941f8cef 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java @@ -1,9 +1,7 @@ package com.engine.salary.mapper.siarchives; -import com.engine.salary.entity.salarysob.po.SalarySobEmpFieldPO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; import org.apache.ibatis.annotations.Param; import java.util.Collection; diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml index 1f003ba57..7c9885e1d 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml @@ -202,11 +202,11 @@ WHERE t.delete_type = 0 AND t.run_status = '3' AND ( - (social.social_end_time is not null and social.social_end_time ]]> ' ' and social.social_end_time ]]> #{today}) + (social.social_end_time is not null and social.social_end_time ]]> #{today}) OR - (fund.fund_end_time is not null and fund.fund_end_time ]]> ' ' and fund.fund_end_time ]]> #{today}) + (fund.fund_end_time is not null and fund.fund_end_time ]]> #{today}) OR - (other.other_end_time is not null and other.other_end_time ]]> ' ' and other.other_end_time ]]> #{today}) + (other.other_end_time is not null and other.other_end_time ]]> #{today}) ) @@ -219,9 +219,9 @@ 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_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})) + AND (social.social_scheme_id is null or (social.social_end_time is not null 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 #{today})) + AND (other.other_scheme_id is null or (other.other_end_time is not null and other.other_end_time #{today}))