身份证

src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java

@@ -78,6 +78,7 @@ public class SalaryArchiveBO {
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "工号"), "workcode"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile"));
+        columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86186, "证件号码"), "mobile"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "员工状态"), "employeeStatus"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "起始发薪日期"), "payStartDate"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "最后发薪日期"), "payEndDate"));

src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java

@@ -89,6 +89,12 @@ public class SalaryArchiveListDTO {
     @TableTitle(title = "工号", dataIndex = "workcode", key = "workcode")
     private String workcode;
 
+    /**
+     * 工号
+     */
+    @TableTitle(title = "证件号码", dataIndex = "workcode", key = "workcode")
+    private String idNo;
+
     /**
      * 员工状态
      */

src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml

@@ -99,6 +99,7 @@
         , e.companystartdate as companystartdate
         , e.enddate as dismissdate
         , e.status AS employeeStatus
+        ,e.certificatenum as idNo
         , d.departmentname AS departmentName
         , c.subcompanyname AS subcompanyName
     </sql>

src/com/engine/salary/service/SalaryEmployeeService.java

@@ -85,9 +85,10 @@ public interface SalaryEmployeeService {
      * @param deparmentName 部门
      * @param mobile        手机号
      * @param workcode      工号
+     * @param idNo          身份证号
      * @param uid           人员id
      */
-    List<DataCollectionEmployee> matchImportEmployee(String confValue, List<DataCollectionEmployee> employeeList, String userName, String deparmentName, String mobile, String workcode, Long uid);
+    List<DataCollectionEmployee> matchImportEmployee(String confValue, List<DataCollectionEmployee> employeeList, String userName, String deparmentName, String mobile, String workcode, String idNo, Long uid);
 
     String empValidType();
 

src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java

@@ -235,9 +235,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
                 String deparmentName = dto.getDepartmentName();
                 String mobile = dto.getMobile();
                 String workcode = dto.getJobNum();
+                String idNo = dto.getIdNo();
 
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null);
+                List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, idNo, null);
 
                 if (StringUtils.isBlank(userName) && "0".equals(confValue)) {
                     //姓名 不能为空

src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java

@@ -606,9 +606,10 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
                 String deparmentName = dto.getDepartmentName();
                 String mobile = dto.getMobile();
                 String workcode = dto.getJobNum();
+                String idNo = dto.getIdNo();
 
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null);
+                List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, idNo,null);
 
                 //当人员信息导入筛选的全局配置为"0"时，姓名才是必填项
                 if (StringUtils.isBlank(userName) && "0".equals(confValue)) {

src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java

@@ -702,10 +702,11 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
                 String deparmentName = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86185, "部门"))).orElse("").toString();
                 String mobile = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86186, "手机号"))).orElse("").toString();
                 String workcode = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86317, "工号"))).orElse("").toString();
+                String idNo = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86317, "证件号码"))).orElse("").toString();
                 List<Long> employeeSameIds = new ArrayList<>();
 
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null);
+                List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, idNo, null);
                 //含在职和离职，选在职数据
                 if (CollectionUtils.isNotEmpty(emps) && emps.size() > 1) {
                     employeeSameIds = emps.stream()

src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java

@@ -251,10 +251,11 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
                 String deparmentName = dto.getDepartmentName();
                 String mobile = dto.getMobile();
                 String workcode = dto.getJobNum();
+                String idNo = dto.getIdNo();
                 List<Long> employeeSameIds = new ArrayList<>();
 
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null);
+                List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, idNo,null);
                 //含在职和离职，选在职数据
                 if (CollectionUtils.isNotEmpty(emps) && emps.size() > 1) {
                     employeeSameIds = emps.stream()

src/com/engine/salary/service/impl/SIAccountServiceImpl.java

@@ -1758,6 +1758,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                     String deparmentName = (String) map.getOrDefault("部门", "");
                     String mobile = (String) map.getOrDefault("手机号", "");
                     String workcode = (String) map.getOrDefault("工号", "");
+                    String idNo = (String) map.getOrDefault("证件号码", "");
 
 
                     if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
@@ -1770,7 +1771,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
                         } else {
                             //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,salaryEmployees, dataValue, deparmentName, mobile, workcode, null);
+                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,salaryEmployees, dataValue, deparmentName, mobile, workcode,idNo, null);
 
                             if (CollectionUtils.isEmpty(employeeSameIds)) {
                                 isError = true;
@@ -3036,6 +3037,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                     String deparmentName = (String) map.getOrDefault("部门", "");
                     String mobile = (String) map.getOrDefault("手机号", "");
                     String workcode = (String) map.getOrDefault("工号", "");
+                    String idNo = (String) map.getOrDefault("证件号码", "");
 
 
                     if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
@@ -3048,7 +3050,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
                         } else {
                             //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,salaryEmployees, dataValue, deparmentName, mobile, workcode, null);
+                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,salaryEmployees, dataValue, deparmentName, mobile, workcode, idNo,null);
 
                             if (CollectionUtils.isEmpty(employeeSameIds)) {
                                 isError = true;
@@ -3898,6 +3900,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                     String departmentName = (String) map.getOrDefault("部门", "");
                     String mobile = (String) map.getOrDefault("手机号", "");
                     String workcode = (String) map.getOrDefault("工号", "");
+                    String idNo = (String) map.getOrDefault("证件号码", "");
 
 
                     if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
@@ -3910,7 +3913,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
                         } else {
                             //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,salaryEmployees, name, departmentName, mobile, workcode, null);
+                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,salaryEmployees, name, departmentName, mobile, workcode,idNo, null);
 
                             if (CollectionUtils.isEmpty(employeeSameIds)) {
                                 isError = true;

src/com/engine/salary/service/impl/SISchemeServiceImpl.java

@@ -1101,6 +1101,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
         String mobile = (String) mobileMap.get(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
         String userStatus = (String) userStatusMap.get(SalaryI18nUtil.getI18nLabel(86187, "员工状态"));
         String workcode = (String) workcodeMap.get(SalaryI18nUtil.getI18nLabel(86317, "工号"));
+        String idNo = (String) workcodeMap.get(SalaryI18nUtil.getI18nLabel(86317, "证件号码"));
         String toAddEmployeeId;
         if (employeeIdMap.isEmpty()) {
             toAddEmployeeId = null;
@@ -1126,7 +1127,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
                 isError = true;
             }
             //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-            employees = getSalaryEmployeeService(user).matchImportEmployee(confValue,employeeByIds, userName, deparmentName, mobile, workcode, null);
+            employees = getSalaryEmployeeService(user).matchImportEmployee(confValue,employeeByIds, userName, deparmentName, mobile, workcode,idNo, null);
         } else {
             employees = employeeByIds.stream().filter(f -> f.getEmployeeId().equals(addEmployeeId)).collect(Collectors.toList());
         }

src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java

@@ -1115,6 +1115,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                     String deparmentName = (String) map.getOrDefault("部门", "");
                     String mobile = (String) map.getOrDefault("手机号", "");
                     String workcode = (String) map.getOrDefault("工号", "");
+                    String idNo = (String) map.getOrDefault("证件号码", "");
 
                     if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) {
                         usernameIndex = j;
@@ -1126,7 +1127,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                             //salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"), i, i, j, j);
                         } else {
                             //筛选导入人员信息可以在人力资源池中匹配到的人员信息
-                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, salaryEmployees, dataValue, deparmentName, mobile, workcode, null);
+                            List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, salaryEmployees, dataValue, deparmentName, mobile, workcode,idNo, null);
 
                             if (CollectionUtils.isEmpty(employeeSameIds)) {
                                 isError = true;

src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java

@@ -228,7 +228,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
     }
 
     @Override
-    public List<DataCollectionEmployee> matchImportEmployee(String confValue, List<DataCollectionEmployee> employeeList, String userName, String deparmentName, String mobile, String workcode, Long uid) {
+    public List<DataCollectionEmployee> matchImportEmployee(String confValue, List<DataCollectionEmployee> employeeList, String userName, String deparmentName, String mobile, String workcode, String idNo, Long uid) {
         if (uid != null) {
             return employeeList.stream()
                     .filter(e -> Objects.equals(e.getEmployeeId(), uid))
@@ -245,6 +245,9 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         } else if ("1".equals(confValue)) {
             employees = employeeList.stream().filter(e -> (StringUtils.isBlank(workcode) || Objects.equals(e.getWorkcode(), workcode)))
                     .collect(Collectors.toList());
+        } else if ("2".equals(confValue)) {
+            employees = employeeList.stream().filter(e -> (StringUtils.isBlank(idNo) || Objects.equals(e.getIdNo(), idNo)))
+                    .collect(Collectors.toList());
         }
 
         return SalaryI18nUtil.i18nList(employees);
@@ -273,7 +276,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
         if (CollectionUtils.isEmpty(virtualDepartmentIds)) {
             return Collections.emptyList();
         }
-        return  SalaryI18nUtil.i18nList(getEmployMapper().getVirtualDeptInfoList(virtualDepartmentIds));
+        return SalaryI18nUtil.i18nList(getEmployMapper().getVirtualDeptInfoList(virtualDepartmentIds));
     }
 
 

src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java

@@ -330,7 +330,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
 
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
                 List<DataCollectionEmployee> emps = getSalaryEmployeeService(user)
-                        .matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null);
+                        .matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null,null);
                 //含在职和离职，选在职数据
                 if (CollectionUtils.isNotEmpty(emps) && emps.size() > 1) {
                     employeeSameIds = emps.stream()

src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java

@@ -242,11 +242,12 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd
                 String deparmentName = dto.getDepartmentName();
                 String mobile = dto.getMobile();
                 String workcode = dto.getJobNum();
+                String idNo = dto.getIdNo();
                 List<Long> employeeSameIds = new ArrayList<>();
 
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
                 List<DataCollectionEmployee> emps = getSalaryEmployeeService(user)
-                        .matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null);
+                        .matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, idNo,null);
                 //含在职和离职，选在职数据
                 if (CollectionUtils.isNotEmpty(emps) && emps.size() > 1) {
                     employeeSameIds = emps.stream()

src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java

@@ -867,12 +867,13 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
                 String deparmentName = dto.getDepartmentName();
                 String mobile = dto.getMobile();
                 String workcode = dto.getJobNum();
+
                 String employeeStatusStr = dto.getEmployeeStatus();
                 List<Long> employeeSameIds = new ArrayList<>();
 
                 //筛选导入人员信息可以在人力资源池中匹配到的人员信息
                 List<DataCollectionEmployee> emps = getSalaryEmployeeService()
-                        .matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null);
+                        .matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode,null, null);
                 if (CollectionUtils.isNotEmpty(emps)) {
                     employeeSameIds = emps.stream()
                             .map(DataCollectionEmployee::getEmployeeId)