diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 16cab17ec..28ca78474 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -808,8 +808,8 @@ public class SIArchivesBiz { return true; } //设置缴纳对象和缴费状态 - Integer paymentScope = 2; - Integer isPayment = 1; +// Integer paymentScope = 2; +// Integer isPayment = 1; Map paymentBaseJson = JSON.parseObject(paymentBaseString, new HashMap().getClass()); if (paymentBaseJson == null) { return true; @@ -826,12 +826,13 @@ public class SIArchivesBiz { } //根据福利方案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())); + List insuranceSchemeDetailPOList = getInsuranceSchemeDetailMapper().getByPI(primaryId, Long.valueOf(entry.getKey())); + log.info("福利方案id: {},, 福利明细项id:{}", primaryId, Long.valueOf(entry.getKey())); + if (insuranceSchemeDetailPOList.size() == 0) { + log.info("根据福利方案id、险种id、缴纳对象查询明细为null!福利方案id: {}, 缴纳所属: {}, 福利明细项id:{}", primaryId, Long.valueOf(entry.getKey())); return false; } + InsuranceSchemeDetailPO insuranceSchemeDetailPO = insuranceSchemeDetailPOList.get(0); InsuranceSchemeDetailPOEncrypt.decryptItem(insuranceSchemeDetailPO); String lowerLimit = "0.000".equals(insuranceSchemeDetailPO.getLowerLimit()) ? null : insuranceSchemeDetailPO.getLowerLimit(); diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java index 91b1d195f..3b15f7eea 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java @@ -56,8 +56,7 @@ 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); + List getByPI(@Param("primaryId") Long primaryId, @Param("insuranceId") Long insuranceId); /** * 根据主键和是否缴费查询 diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml index ac30d8a24..63e9b6d66 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -95,14 +95,12 @@ AND delete_type = 0 - SELECT FROM hrsa_scheme_detail t WHERE t.insurance_id = #{insuranceId} - AND t.payment_scope = #{paymentScope} AND t.primary_id = #{primaryId} - AND t.is_payment = #{isPayment} AND delete_type = 0