From 3826e89a72496e4b2b51366fd36877a89e21b526 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 15 Sep 2023 15:38:20 +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=E5=8F=B0=E8=B4=A6=EF=BC=8C=E7=A6=8F=E5=88=A9=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9C=AA=E8=AE=BE=E7=BD=AE=E5=9F=BA=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=85=E8=AE=BE=E7=BD=AE=E5=9B=BA=E5=AE=9A=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E7=9A=84=E6=A0=B8=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIAccountBiz.java | 48 +++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index ffa532b2a..a07390040 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -614,6 +614,14 @@ public class SIAccountBiz extends Service {
                         }
                     });
                 }
+                //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加
+                if(otherPerson.size() > 0) {
+                    otherPerson.forEach((id, object) -> {
+                        if (!needArchivesPerson.contains(id)) {
+                            needArchivesPerson.add(id);
+                        }
+                    });
+                }
                 //判断核算周期、核算月、福利起始缴纳月的关系
                 checkCycleSettingWithStartMonth(otherPerson, billMonth, otherPO.getOtherStartTime());
 
@@ -676,6 +684,14 @@ public class SIAccountBiz extends Service {
                         }
                     });
                 }
+                //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加
+                if(otherCom.size() > 0) {
+                    otherCom.forEach((id, object) -> {
+                        if (!needArchivesCom.contains(id)) {
+                            needArchivesCom.add(id);
+                        }
+                    });
+                }
                 //判断核算周期、核算月、福利起始缴纳月的关系
                 checkCycleSettingWithStartMonth(otherCom, billMonth, otherPO.getOtherStartTime());
 
@@ -756,6 +772,14 @@ public class SIAccountBiz extends Service {
                         }
                     });
                 }
+                //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加
+                if(fundperson.size() > 0) {
+                    fundperson.forEach((id, object) -> {
+                        if (!needArchivesPerson.contains(id)) {
+                            needArchivesPerson.add(id);
+                        }
+                    });
+                }
                 //判断核算周期、核算月、福利起始缴纳月的关系
                 checkCycleSettingWithStartMonth(fundperson, billMonth, fundPO.getFundStartTime());
 
@@ -817,6 +841,14 @@ public class SIAccountBiz extends Service {
                         }
                     });
                 }
+                //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加
+                if(fundCom.size() > 0) {
+                    fundCom.forEach((id, object) -> {
+                        if (!needArchivesCom.contains(id)) {
+                            needArchivesCom.add(id);
+                        }
+                    });
+                }
                 //判断核算周期、核算月、福利起始缴纳月的关系
                 checkCycleSettingWithStartMonth(fundCom, billMonth, fundPO.getFundStartTime());
 
@@ -900,6 +932,14 @@ public class SIAccountBiz extends Service {
                         }
                     });
                 }
+                //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加
+                if(schemeperson.size() > 0) {
+                    schemeperson.forEach((id, object) -> {
+                        if (!needArchivesPerson.contains(id)) {
+                            needArchivesPerson.add(id);
+                        }
+                    });
+                }
                 //判断核算周期、核算月、福利起始缴纳月的关系
                 checkCycleSettingWithStartMonth(schemeperson, billMonth, socialPO.getSocialStartTime());
 
@@ -961,6 +1001,14 @@ public class SIAccountBiz extends Service {
                         }
                     });
                 }
+                //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加
+                if(schemeCom.size() > 0) {
+                    schemeCom.forEach((id, object) -> {
+                        if (!needArchivesCom.contains(id)) {
+                            needArchivesCom.add(id);
+                        }
+                    });
+                }
                 //判断核算周期、核算月、福利起始缴纳月的关系
                 checkCycleSettingWithStartMonth(schemeCom, billMonth, socialPO.getSocialStartTime());