From 0e1242daa7771510c2c254a6046f17b15d03f255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 28 May 2024 14:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/TaxDeclarationExcelServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
index 9be20c0ad..63581da27 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
@@ -7,7 +7,6 @@ import com.engine.core.impl.Service;
 import com.engine.salary.config.SalaryElogConfig;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
-import com.engine.hrmelog.entity.dto.LoggerContext;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.entity.taxdeclaration.dto.AbnormalEmployeeListDTO;
 import com.engine.salary.entity.taxdeclaration.dto.FailEmployeeListDTO;
@@ -221,6 +220,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar
         heads.add(SalaryI18nUtil.getI18nLabel(86185, "部门"));
         heads.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
         heads.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
+        heads.add(SalaryI18nUtil.getI18nLabel(86317, "证件号码"));
         heads.addAll(SalaryEntityUtil.properties(taxReportColumnPOS, TaxReportColumnPO::getReportColumnName, Collectors.toList()));
 
         List<List<Object>> rowList = new ArrayList<>();
@@ -336,6 +336,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar
                 String deparmentName = (String) map.getOrDefault("部门", "");
                 String mobile = (String) map.getOrDefault("手机号", "");
                 String workcode = (String) map.getOrDefault("工号", "");
+                String idNo = (String) map.getOrDefault("证件号码", "");
 
                 if (StringUtils.isEmpty(username) && "0".equals(confValue)) {
                     isError = true;
@@ -344,7 +345,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar
                     excelComments.add(errorMessageMap);
                 } else {
                     //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                    List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, salaryEmployees, username, deparmentName, mobile, workcode, null);
+                    List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, salaryEmployees, username, deparmentName, mobile, workcode, idNo,null);
 
                     if (CollectionUtils.isEmpty(employeeSameIds)) {
                         isError = true;