diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index ba84404eb..69fa88787 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -807,8 +807,9 @@ public class SIArchivesBiz { if (primaryId ==null || paymentBaseString == null) { return true; } - //设置缴纳对象 + //设置缴纳对象和缴费状态 Integer paymentScope = 2; + Integer isPayment = 1; Map paymentBaseJson = JSON.parseObject(paymentBaseString, new HashMap().getClass()); if (paymentBaseJson == null) { return true; @@ -824,8 +825,8 @@ public class SIArchivesBiz { return false; } - //根据福利方案id、险种id、缴纳对象查询明细 - InsuranceSchemeDetailPO insuranceSchemeDetailPO = getInsuranceSchemeDetailMapper().getByPPI(primaryId, paymentScope, Long.valueOf(entry.getKey())); + //根据福利方案id、险种id、缴纳对象、缴费状态查询明细 + InsuranceSchemeDetailPO insuranceSchemeDetailPO = getInsuranceSchemeDetailMapper().getByPPII(primaryId, paymentScope, Long.valueOf(entry.getKey()), isPayment); log.info("福利方案id: {}, 缴纳所属: {}, 福利明细项id:{}", primaryId, paymentScope, Long.valueOf(entry.getKey())); if (insuranceSchemeDetailPO == null) { log.info("根据福利方案id、险种id、缴纳对象查询明细为null!福利方案id: {}, 缴纳所属: {}, 福利明细项id:{}", primaryId, paymentScope, Long.valueOf(entry.getKey())); diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java index f58bc8354..91b1d195f 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java @@ -56,6 +56,8 @@ public interface InsuranceSchemeDetailMapper { InsuranceSchemeDetailPO getByPPI(@Param("primaryId") Long primaryId, @Param("paymentScope") Integer paymentScope, @Param("insuranceId") Long insuranceId); + InsuranceSchemeDetailPO getByPPII(@Param("primaryId") Long primaryId, @Param("paymentScope") Integer paymentScope, + @Param("insuranceId") Long insuranceId, @Param("isPayment") Integer isPayment); /** * 根据主键和是否缴费查询 diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml index 407796412..ac30d8a24 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -95,6 +95,17 @@ AND delete_type = 0 + +