diff --git a/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java index 2f5398655..ec0c11784 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java @@ -451,6 +451,10 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar result.put("证件号码", local.get("证件号码")); String no = local.getOrDefault("证件号码", "").toString(); Map online = onlineNoMap.get(no); + if (online == null) { + log.warn("线上没有该条数据,请检查!证件号码:{}", no); + continue; + } taxReportColumns.stream().map(TaxReportColumnPO::getReportColumnName).forEach(col -> { ContrastListDTO dto = new ContrastListDTO(); @@ -496,7 +500,7 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar headerList.addAll((param.isOnlyShowDiffItem() ? finalOnlyShowColumns : columns).stream().collect(Collectors.toList())); resultList.put("columns", headerList); resultList.put("pageInfo", SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), oneResultList)); - + // 显示定制列 List weaColumns = new ArrayList<>(); weaColumns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "工号"), "工号")); @@ -525,7 +529,7 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar // 获取线下对比结果 Map contrastMap = contrast(param); List header = ((List) contrastMap.get("columns")); - PageInfo> pageInfo = (PageInfo>)contrastMap.get("pageInfo"); + PageInfo> pageInfo = (PageInfo>) contrastMap.get("pageInfo"); List> list = pageInfo.getList(); List empInfoColumns = new ArrayList<>();