Commit 066b1c04 authored by hongguangwu's avatar hongguangwu

MVP1.7.14-薪资人员导入校验优化

parent 85d1dcc2
...@@ -774,7 +774,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -774,7 +774,7 @@ public class SalaryAccountUtil implements Serializable {
entity.setEmpId(emp.getId()); entity.setEmpId(emp.getId());
entity.setEmpIdcard(emp.getEmpIdcard()); entity.setEmpIdcard(emp.getEmpIdcard());
entity.setEmpName(emp.getEmpName()); entity.setEmpName(emp.getEmpName());
entity.setEmpPhone(emp.getEmpPhone());
// hgs 2024-7-19 09:33:29 新增按照页面开关与新员工字段,来更新员工信息: // hgs 2024-7-19 09:33:29 新增按照页面开关与新员工字段,来更新员工信息:
if (SalaryConstants.SALARY_STYLE_BANK.equals(salaryStyle)) { if (SalaryConstants.SALARY_STYLE_BANK.equals(salaryStyle)) {
if (CommonConstants.ONE_STRING.equals(newEmpUpdateFlag) && isNewEmployee) { if (CommonConstants.ONE_STRING.equals(newEmpUpdateFlag) && isNewEmployee) {
...@@ -897,6 +897,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -897,6 +897,7 @@ public class SalaryAccountUtil implements Serializable {
entity.setBankProvince(String.valueOf(emp.getBankProvince())); entity.setBankProvince(String.valueOf(emp.getBankProvince()));
entity.setBankCity(String.valueOf(emp.getBankCity())); entity.setBankCity(String.valueOf(emp.getBankCity()));
entity.setBankSubName(emp.getBankSubName()); entity.setBankSubName(emp.getBankSubName());
entity.setEmpPhone(emp.getEmpPhone());
} else { } else {
if (Common.isNotNull(emp.getBankName())) { if (Common.isNotNull(emp.getBankName())) {
if (bankMap.get(emp.getBankName()) == null) { if (bankMap.get(emp.getBankName()) == null) {
...@@ -928,7 +929,10 @@ public class SalaryAccountUtil implements Serializable { ...@@ -928,7 +929,10 @@ public class SalaryAccountUtil implements Serializable {
} else { } else {
entity.setBankCity(null); entity.setBankCity(null);
} }
entity.setEmpPhone(emp.getEmpPhone());
} }
} else {
entity.setEmpPhone(emp.getEmpPhone());
} }
if (!"3".equals(salaryType) && !"4".equals(salaryType)) { if (!"3".equals(salaryType) && !"4".equals(salaryType)) {
if (emp.getTaxMonth().length() > CommonConstants.dingleDigitIntArray[6]) { if (emp.getTaxMonth().length() > CommonConstants.dingleDigitIntArray[6]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment