Commit 329df667 authored by hongguangwu's avatar hongguangwu

1.7.23-工资导入与0申报导入逻辑

parent f36dc400
...@@ -1016,7 +1016,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -1016,7 +1016,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
} }
// 变更日志 fxj 2023-10-24 // 变更日志 fxj 2023-10-24
logService.initModLog(old,emp,CommonConstants.ONE_STRING,user.getNickname(),util); logService.initModLog(emp,old,CommonConstants.ONE_STRING,user.getNickname(),util);
baseMapper.updateById(emp); baseMapper.updateById(emp);
/*if (curTaxMonth) { /*if (curTaxMonth) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.CUR_TAX_INFO)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.CUR_TAX_INFO));
......
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