From 51a181f3d15ca6519b30aaa68ca9d17fb3c6517c Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Thu, 3 Nov 2022 17:05:11 +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=A8=A1=E5=9D=97bug=E4=BF=AE=E5=A4=8Dv5=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88id?=
 =?UTF-8?q?=E3=80=81=E9=99=A9=E7=A7=8Did=E3=80=81=E7=BC=B4=E7=BA=B3?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E3=80=81=E7=BC=B4=E8=B4=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java          |  7 ++++---
 .../mapper/sischeme/InsuranceSchemeDetailMapper.java  |  2 ++
 .../mapper/sischeme/InsuranceSchemeDetailMapper.xml   | 11 +++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

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<String, String> paymentBaseJson = JSON.parseObject(paymentBaseString, new HashMap<String, String>().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
     </select>
 
+    <select id="getByPPII" resultMap="BaseResultMap" >
+        SELECT
+        <include refid="baseColumns"/>
+        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
+    </select>
+
     <!-- 插入全部字段 -->
     <insert id="insert" parameterType="com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO"
             keyProperty="id" keyColumn="id" useGeneratedKeys="true"