From b6331b952c940f201502f5a900e9a24fcf77a1f5 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Jun 2024 11:02:59 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=201=E3=80=81=E7=A4=BE?=
 =?UTF-8?q?=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E8=A1=A5=E5=B7=AE?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF=E8=A1=A5=E5=B7=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=9B=202=E3=80=81=E6=8A=A5=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E4=B8=8D=E8=AE=BE=E7=BD=AE=E8=B5=B7=E5=A7=8B=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6oracle=E6=95=B0=E6=8D=AE=E5=BA=93=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InsuranceAccountDetailMapper.java         |  8 +++++
 .../InsuranceAccountDetailMapper.xml          | 11 ++++++
 .../impl/SalaryStatisticsPushServiceImpl.java |  2 +-
 .../service/impl/SIAccountServiceImpl.java    | 36 ++++++++++++++++++-
 4 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
index 2dec937ca..2a05a0c72 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
@@ -116,6 +116,14 @@ public interface InsuranceAccountDetailMapper {
      */
     List<InsuranceAccountDetailPO> querySupplementListByBillMonth(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
 
+    /**
+     * 查询补差数据
+     * @param billMonth 账单月份
+     * @param paymentOrganization 个税扣缴义务人
+     * @return
+     */
+    List<InsuranceAccountDetailPO> queryBalanceListByBillMonth(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
+
     /**
      * 查询正常缴纳数据
      * @param billMonth 账单月份
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 55b55947e..2f58bed17 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -541,6 +541,17 @@
         AND t.payment_organization = #{paymentOrganization}
     </select>
 
+    <select id="queryBalanceListByBillMonth" resultMap="BaseResultMap">
+        SELECT
+            t.id,t.employee_id,t.supplementary_month,t.supplementary_projects
+        FROM
+            hrsa_bill_detail t
+        WHERE t.delete_type = 0
+          AND t.payment_status = 4
+          AND t.bill_month = #{billMonth}
+          AND t.payment_organization = #{paymentOrganization}
+    </select>
+
     <select id="queryNormalListByBillMonth" resultMap="BaseResultMap">
         SELECT
         t.id,t.employee_id
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
index 2397700e4..421f0a18e 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
@@ -746,7 +746,7 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
         // 报表分享时间校验
         String formatLocalDateTime = SalaryDateUtil.getFormatLocalDate(LocalDateTime.now());
         List<SalaryStatisticsPushPO> result = pushList.stream().filter(pushPO -> {
-            if (pushPO.getStartTime().compareTo(formatLocalDateTime) > 0 || (StringUtils.isNotEmpty(pushPO.getEndTime()) && pushPO.getEndTime().compareTo(formatLocalDateTime) < 0)) {
+            if ((StringUtils.isNotBlank(pushPO.getStartTime()) && pushPO.getStartTime().compareTo(formatLocalDateTime) > 0) || (StringUtils.isNotEmpty(pushPO.getEndTime()) && pushPO.getEndTime().compareTo(formatLocalDateTime) < 0)) {
                 return false;
             }
             return true;
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 9bbaf600f..cbd761e95 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -2056,6 +2056,40 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         return resultList;
     }
 
+    /**
+     * 获取福利台账中的补差数据
+     * @param billMonth 账单月份
+     * @param paymentOrganization 个税扣缴义务人id
+     * @return
+     */
+    private List<Map<String, Object>> getBalanceDataByBillMonth(String billMonth, Long paymentOrganization) {
+
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
+        DataCollectionEmployee employee = new DataCollectionEmployee();
+
+        TaxAgentPO taxAgentPO = taxAgentBiz.getById(paymentOrganization);
+
+        List<InsuranceAccountDetailPO> balanceDataList = getInsuranceAccountDetailMapper().queryBalanceListByBillMonth(billMonth, paymentOrganization);
+
+
+        for(InsuranceAccountDetailPO po : balanceDataList) {
+            Map<String, Object> resultMap = new HashMap<>();
+            employee = getSalaryEmployeeService(user).getEmployeeById(po.getEmployeeId());
+            resultMap.put("username", employee.getUsername());
+            resultMap.put("departmentName", employee.getDepartmentName());
+            resultMap.put("mobile", employee.getMobile());
+            resultMap.put("workcode", employee.getWorkcode());
+            resultMap.put("idNo", employee.getIdNo());
+            resultMap.put("taxAgentName", taxAgentPO.getName());
+            resultMap.put("billMonth", billMonth);
+            resultMap.put("supplementaryMonth", po.getSupplementaryMonth());
+
+            resultList.add(resultMap);
+        }
+        return resultList;
+    }
+
     /**
      * 获取福利台账中的正常缴纳数据
      * @param billMonth 账单月份
@@ -3774,7 +3808,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
         List<List<Object>> rows = new ArrayList<>();
         //查询当前已有的补差数据
-        List<Map<String, Object>> resultMapList = getSupplyDataByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
+        List<Map<String, Object>> resultMapList = getBalanceDataByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
         // excel导出的数据
         rows.add(headerList);
         for (Map<String, Object> map : resultMapList) {

From 91b8809c03503f26e58944e86b8e14c57aed94a0 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Jun 2024 13:43:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=A1=E7=A8=8Ebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SalaryAcctEmployeeServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 05e45d42a..86ee45d37 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -224,7 +224,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         BeanUtils.copyProperties(queryParam, salaryAcctEmployeeQueryParam);
         // 查询薪资核算人员（分页）
         // 如果需要筛选是否合并计税
-        if (StringUtils.isNotEmpty(queryParam.getConsolidatedTaxation())) {
+        if (StringUtils.isNotEmpty(queryParam.getConsolidatedTaxation()) && queryParam.getConsolidatedTaxation().equals("1")) {
             return listPageByParam4ConsolidatedTax(salaryAcctEmployeeQueryParam);
         } else {
             return listPageByParam(salaryAcctEmployeeQueryParam);

From 16f5ffcf2928a904050b70ded79e5e124518f32f Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Jun 2024 15:30:57 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=20-=20=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E5=B0=8F=E6=95=B0=E4=BD=8D?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InsuranceAccountDetailMapper.xml          |  1 +
 .../service/impl/SIAccountServiceImpl.java    | 17 ++++++++
 .../service/impl/SIBalanceServiceImpl.java    | 21 ++++++---
 .../service/impl/SIRepairServiceImpl.java     | 43 +++++++++++++++++--
 4 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 2f58bed17..977fb9edd 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -497,6 +497,7 @@
     <select id="queryNormalList" resultMap="BaseResultMap">
         SELECT
         t.id,t.employee_id,t.social_per_json,t.social_com_json,
+        t.social_scheme_id,t.fund_scheme_id,t.other_scheme_id,
         t.fund_per_json,t.fund_com_json,t.other_per_json,
         t.other_com_json,t.social_per_sum,t.social_com_sum,
         t.fund_per_sum,t.fund_com_sum,t.other_per_sum,
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index cbd761e95..66273cc37 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -3502,6 +3502,16 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         Map<String, Object> resultMap = new HashMap<>();
 //        resultMap.put("data", dataMap);
 //        resultMap.put("items", addGroups);
+        List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = new ArrayList<>();
+        List<Long> schemeIdList = new ArrayList<>();
+        schemeIdList.add(insuranceAccountDetailPO.getSocialSchemeId());
+        schemeIdList.add(insuranceAccountDetailPO.getFundSchemeId());
+        schemeIdList.add(insuranceAccountDetailPO.getOtherSchemeId());
+        schemeIdList = schemeIdList.stream().filter(schemeId -> schemeId != null).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(schemeIdList)) {
+            insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(schemeIdList);
+        }
+        Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
 
         List<Map<String, String>> perList = new ArrayList<>();
         List<Map<String, String>> comList = new ArrayList<>();
@@ -3521,6 +3531,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                         map.put("insuranceName", item.getLabel());
                         map.put("insuranceId", insuranceId);
                         map.put("insuranceValue", dataMap.get(domkey[0]));
+                        map.put("validNum", schemeValidNumMap.getOrDefault(insuranceId + "-2", 2).toString());
                         if (map.get("insuranceValue") != null && !"".equals(map.get("insuranceValue"))) {
 
                             perList.add(map);
@@ -3534,6 +3545,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                         map.put("insuranceName", item.getLabel());
                         map.put("insuranceId", insuranceId);
                         map.put("insuranceValue", dataMap.get(domkey[0]));
+                        map.put("validNum", schemeValidNumMap.getOrDefault(insuranceId + "-1", 2).toString());
                         if (map.get("insuranceValue") != null && !"".equals(map.get("insuranceValue"))) {
 
                             comList.add(map);
@@ -3562,10 +3574,15 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                 }
                 //对比可进行缴纳福利项与上面的已有福利项生成map
                 for (Map<String, String> balancePayItem : balancePaymentGroup) {
+                    Map<String, Object> target = (Map<String, Object>)targetMap.get(balancePayItem.get("insuranceId") + "-" + balancePayItem.get("paymentScope"));
                     if (targetMap.get(balancePayItem.get("insuranceId") + "-" + balancePayItem.get("paymentScope")) == null) {
                         balancePayItem.put("insuranceValue", "");
+                        balancePayItem.put("validNum", balancePayItem.get("validNum"));
                         resultList.add(balancePayItem);
+                    } else {
+                        target.put("validNum", balancePayItem.get("validNum"));
                     }
+
                 }
             }
         }
diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
index 6714938a3..29464725d 100644
--- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
@@ -4,12 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.api.formmode.mybatis.util.SqlProxyHandle;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.hrmelog.entity.dto.LoggerContext;
 import com.engine.salary.config.SalaryElogConfig;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.hrmelog.entity.dto.LoggerContext;
 import com.engine.salary.encrypt.EncryptUtil;
 import com.engine.salary.entity.siaccount.param.BalanceAccountBaseParam;
-import com.engine.salary.entity.siaccount.param.EditAccountDetailParam;
 import com.engine.salary.entity.siaccount.param.InspectAccountParam;
 import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO;
 import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO;
@@ -24,7 +23,6 @@ import com.engine.salary.enums.siaccount.ResourceFromEnum;
 import com.engine.salary.enums.sicategory.DeleteTypeEnum;
 import com.engine.salary.enums.sicategory.IsPaymentEnum;
 import com.engine.salary.enums.sicategory.PaymentScopeEnum;
-import com.engine.salary.enums.sicategory.WelfareTypeEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.siaccount.InsuranceAccountBatchMapper;
 import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper;
@@ -39,17 +37,15 @@ import com.engine.salary.service.SIAccountService;
 import com.engine.salary.service.SIBalanceService;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
+import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.google.common.collect.Lists;
-import com.engine.salary.util.db.IdGenerator;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.hrm.User;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 
@@ -175,6 +171,8 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> socialMap = JSON.parseObject(socialSchemePO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
+            List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+            Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
             socialMap.forEach((k, v) -> {
                 String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                 String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -187,6 +185,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
                     comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                     comMap.put("paymentScope", "公司");
                     comMap.put("paymentScopeSign", "com");
+                    comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                     resultList.add(comMap);
                 }
                 if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -198,6 +197,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
                     perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                     perMap.put("paymentScope", "个人");
                     perMap.put("paymentScopeSign", "per");
+                    perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                     resultList.add(perMap);
                 }
             });
@@ -207,6 +207,8 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> fundMap = JSON.parseObject(fundSchemePO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId());
+            List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+            Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
             fundMap.forEach((k, v) -> {
                 String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                 String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -219,6 +221,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
                     comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                     comMap.put("paymentScope", "公司");
                     comMap.put("paymentScopeSign", "com");
+                    comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                     resultList.add(comMap);
                 }
                 if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -230,6 +233,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
                     perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                     perMap.put("paymentScope", "个人");
                     perMap.put("paymentScopeSign", "per");
+                    perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                     resultList.add(perMap);
                 }
             });
@@ -239,6 +243,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> otherMap = JSON.parseObject(otherSchemePO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId());
+            List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+            Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
+
             otherMap.forEach((k, v) -> {
                 String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                 String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -251,6 +258,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
                     comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                     comMap.put("paymentScope", "公司");
                     comMap.put("paymentScopeSign", "com");
+                    comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                     resultList.add(comMap);
                 }
                 if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -262,6 +270,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
                     perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                     perMap.put("paymentScope", "个人");
                     perMap.put("paymentScopeSign", "per");
+                    perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                     resultList.add(perMap);
                 }
             });
diff --git a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java
index a37f5298f..270fbb143 100644
--- a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java
@@ -28,10 +28,7 @@ import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -230,6 +227,8 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                 Map<String, String> socialMap = JSON.parseObject(socialSchemePO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
                 socialMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -241,6 +240,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -251,6 +251,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -260,6 +261,8 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                 Map<String, String> fundMap = JSON.parseObject(fundSchemePO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(fundSchemePO.getFundSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
                 fundMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -271,6 +274,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -281,6 +285,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -290,6 +295,8 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                 Map<String, String> otherMap = JSON.parseObject(otherSchemePO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(otherSchemePO.getOtherSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
                 otherMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -301,6 +308,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -311,6 +319,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -322,6 +331,8 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                 Map<String, String> socialMap = JSON.parseObject(socialSchemePO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
                 socialMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null &&  welfareTypeMap.get(Long.valueOf(k))  == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null &&  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null &&  welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -333,6 +344,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -343,6 +355,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -358,6 +371,8 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
                 socialMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -369,6 +384,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -379,6 +395,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -394,6 +411,8 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
                 socialMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -405,6 +424,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -415,6 +435,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -430,6 +451,8 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
                 socialMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -441,6 +464,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -451,6 +475,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -462,6 +487,9 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                 Map<String, String> fundMap = JSON.parseObject(fundSchemePO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(fundSchemePO.getFundSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
+
                 fundMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -473,6 +501,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -483,6 +512,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });
@@ -494,6 +524,9 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                 Map<String, String> otherMap = JSON.parseObject(otherSchemePO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
                 //查询该福利方案下开启缴纳的福利项
                 List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId());
+                List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(otherSchemePO.getOtherSchemeId()));
+                Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
+
                 otherMap.forEach((k, v) -> {
                     String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
                     String welfareTypeSign =  welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 1 ? "social" : (welfareTypeMap.get(Long.valueOf(k)) != null && welfareTypeMap.get(Long.valueOf(k)) == 2 ? "fund" : "other" );
@@ -505,6 +538,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         comMap.put("paymentScope", "公司");
                         comMap.put("paymentScopeSign", "com");
+                        comMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_COMPANY.getValue(), 2).toString());
                         resultList.add(comMap);
                     }
                     if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) {
@@ -515,6 +549,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService {
                         perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k)));
                         perMap.put("paymentScope", "个人");
                         perMap.put("paymentScopeSign", "per");
+                        perMap.put("validNum",schemeValidNumMap.getOrDefault(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue(), 2).toString());
                         resultList.add(perMap);
                     }
                 });

From 91444e9495154f5a856a42c814b4f12ec4b1ff38 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Jun 2024 16:54:53 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2ISNOTEMPT?=
 =?UTF-8?q?Y=20=E4=B8=AD=E6=96=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/enums/common/FilterEnum.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/enums/common/FilterEnum.java b/src/com/engine/salary/enums/common/FilterEnum.java
index c3d1ea2a5..ae7de1221 100644
--- a/src/com/engine/salary/enums/common/FilterEnum.java
+++ b/src/com/engine/salary/enums/common/FilterEnum.java
@@ -90,7 +90,7 @@ public enum FilterEnum implements BaseEnum<String> {
             return StringUtils::isEmpty;
         }
     },
-    ISNOTEMPTY("ISNOTEMPTY", "包含", 1) {
+    ISNOTEMPTY("ISNOTEMPTY", "不为空", 1) {
         @Override
         public Predicate<String> filter(List<String> params) {
             return StringUtils::isNotEmpty;

From 789b77ba0b0345ce5540ec3992d6c7ad0cffa483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 6 Jun 2024 14:54:58 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SalaryArchiveExcelServiceImpl.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
index fa07ed7c6..c655d2d93 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
@@ -382,16 +382,16 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
 //        SalaryArchiveExcelBO.createExcelComment(excelComments, requireI18n + '，' + SalaryI18nUtil.getI18nLabel(127641, "多个账套之间用,分隔"), 0, 0, 3, 3);
 //        int i = enableHr ? 10 : 9;
         if (isPendingList) {
-            excelComments.add(new ExcelComment(6, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'")));
+            excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'")));
 //                excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'")));
         } else if (isFixedList) {
             if (isInit) {
-                excelComments.add(new ExcelComment(6, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'")));
-                excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'")));
-                excelComments.add(new ExcelComment(8, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'")));
-            } else if (isSalaryItemAdjust) {
-                excelComments.add(new ExcelComment(6, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "必填,可填写如:入职,转正,调薪,晋升,降职,调岗,调岗调薪,离职,其他,初始化")));
                 excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'")));
+                excelComments.add(new ExcelComment(8, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'")));
+                excelComments.add(new ExcelComment(9, 0, 11, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'")));
+            } else if (isSalaryItemAdjust) {
+                excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "必填,可填写如:入职,转正,调薪,晋升,降职,调岗,调岗调薪,离职,其他,初始化")));
+                excelComments.add(new ExcelComment(8, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'")));
             }
         } else if (isSuspendList) {
 //            SalaryArchiveExcelBO.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(109736, "格式样例为'2022-01-01'、'2022/1/1'"), 0, 0, i + 1, i + 1);

From 7a67253407a34375210c3ad7b1291cdb98053191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 6 Jun 2024 15:35:12 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/prop/hrmSalary.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties
index 0638a4f0d..c62ade2bb 100644
--- a/resource/WEB-INF/prop/hrmSalary.properties
+++ b/resource/WEB-INF/prop/hrmSalary.properties
@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=2.14.2.2405.02
+version=2.14.3.2406.01
 openFormulaForcedEditing=false
\ No newline at end of file