Commit 0c66d60f authored by hongguangwu's avatar hongguangwu

MVP1.6.7-薪资导入相关

parent 3a4bf6a4
...@@ -992,7 +992,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -992,7 +992,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
one.setEmpName(vo.getEmpName()); one.setEmpName(vo.getEmpName());
one.setBankName(vo.getBankName()); one.setBankName(vo.getBankName());
baseMapper.updateById(one); baseMapper.updateById(one);
logService.initModLog(old,one,CommonConstants.TWO_STRING, "ekp",null); logService.initModLog(one,old,CommonConstants.TWO_STRING, "ekp",null);
} }
return R.ok(); return R.ok();
} }
...@@ -1027,7 +1027,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -1027,7 +1027,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if (pre != null) return R.failed(pre); if (pre != null) return R.failed(pre);
// 变更日志 fxj 2023-10-24 // 变更日志 fxj 2023-10-24
logService.initModLog(old,tSalaryEmployee,CommonConstants.ZERO_STRING,user.getNickname(),null); logService.initModLog(tSalaryEmployee,old,CommonConstants.ZERO_STRING,user.getNickname(),null);
int res = baseMapper.updateById(tSalaryEmployee); int res = baseMapper.updateById(tSalaryEmployee);
if (res >= CommonConstants.ZERO_INT){ if (res >= CommonConstants.ZERO_INT){
return R.ok(); return R.ok();
...@@ -1115,7 +1115,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -1115,7 +1115,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
newEmp.setTaxMonth(employee.getTaxMonth()); newEmp.setTaxMonth(employee.getTaxMonth());
} }
// 变更日志 hgw 2024-7-16 18:19:57 // 变更日志 hgw 2024-7-16 18:19:57
logService.initModLog(employee,newEmp,CommonConstants.THREE_STRING,newEmp.getCreateName(), null); logService.initModLog(newEmp,employee,CommonConstants.THREE_STRING,newEmp.getCreateName(), null);
BeanUtil.copyProperties(newEmp, employee, ignoreProperties); BeanUtil.copyProperties(newEmp, employee, ignoreProperties);
this.updateById(employee); this.updateById(employee);
} else { } else {
......
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