Commit dae61488 authored by chenyuxi's avatar chenyuxi

feat: 薪酬导入校验去掉todo

parent b6a75d4b
...@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
} }
// 银行卡 // 银行卡
// 代发户的,不校验卡号,下次使用的时候校验卡号 // 代发户的,不校验卡号,下次使用的时候校验卡号
// todo cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里) // cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
if (Common.isNotNull(employee.getBankNo())) { if (Common.isNotNull(employee.getBankNo())) {
//if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) { //if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
// 调用校验服务 // 调用校验服务
......
...@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable { ...@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable {
newEmp.setEmpName(empName); newEmp.setEmpName(empName);
} }
// todo cyx-mvp1.7.0修复:去掉重复判断 // cyx-mvp1.7.0修复:去掉重复判断
if ((SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) || SalaryConstants.IS_NEW_EMPLOYEE.equals(dbFiedName)) if (SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) && SalaryConstants.IS_NEW.equals(cellValueStr)) {
&& SalaryConstants.IS_NEW.equals(cellValueStr)) {
isNewEmployee = true; isNewEmployee = true;
entity.setIsNewEmployee(CommonConstants.ONE_STRING); entity.setIsNewEmployee(CommonConstants.ONE_STRING);
} }
...@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable { ...@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable {
} }
if (canSave) { if (canSave) {
log.error("走到了》》》》canSave"); log.error("走到了》》》》canSave");
log.error("走到了》》》》saveNewEmpList>>>{}",saveNewEmpList.toString());
// 新增 // 新增
if (!saveNewEmpList.isEmpty()) { if (!saveNewEmpList.isEmpty()) {
log.error("走到了》》》》saveNewEmpList"); log.error("走到了》》》》saveNewEmpList");
tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList); tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
} }
log.error("走到了》》》》updateEmpBankList>>>{}",updateEmpBankList.toString());
// 更新人员信息 // 更新人员信息
if (!updateEmpBankList.isEmpty()) { if (!updateEmpBankList.isEmpty()) {
log.error("走到了》》》》updateEmpBankList"); log.error("走到了》》》》updateEmpBankList");
......
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