Merge remote-tracking branch 'remotes/origin/feature/230701-社保福利-核算记录的校验' into release/2.9.2.2307.02

This commit is contained in:
sy 2023-07-20 17:06:38 +08:00
commit 40de6e0e6b
1 changed files with 1 additions and 0 deletions

View File

@ -111,6 +111,7 @@ public class SalaryFormulaWrapper extends Service {
param.setSourceId("welfare");
//获取福利类薪资项目
List<FormulaVar> list = getRemoteExcelService(user).fieldList(param.getSourceId(), param.getExtendParam());
list = list.stream().filter(f -> !(f.getName().contains("正常缴纳") || f.getName().contains("补缴") || f.getName().contains("补差"))).collect(Collectors.toList());
//提取出福利类项目名称
for (FormulaVar formulaVar : list) {
InsuranceAcctDetailImportFieldDTO insuranceAcctDetailImportFieldDTO = new InsuranceAcctDetailImportFieldDTO();