qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.13.1.2404.02' into release/个税版本

This commit is contained in:
钱涛 2024-04-25 13:46:13 +08:00
parent 0661406c97 c9075058d5
commit 353a007149
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
View File

@ -421,7 +421,6 @@ public class SalaryArchiveExcelBO extends Service {
Map<String, String> errorMessageMap = Maps.newHashMap(); Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + "个税扣缴义务人不存在"); errorMessageMap.put("message", rowindex + "个税扣缴义务人不存在");
excelComments.add(errorMessageMap); excelComments.add(errorMessageMap);
// SalaryArchiveExcelBO.createExcelComment(excelComments, taxAgentRangeMsg, errorCount + 1, errorCount + 1, 0, 0);
isError = true; isError = true;
return isError; return isError;
} }
@ -440,14 +439,15 @@ public class SalaryArchiveExcelBO extends Service {
taxAgentRangeSaveParam.setTargetParams(Collections.singletonList(taxAgentSubAdminRangeTargetParam)); taxAgentRangeSaveParam.setTargetParams(Collections.singletonList(taxAgentSubAdminRangeTargetParam));
taxAgentRangeSaveParam.setSync(true); taxAgentRangeSaveParam.setSync(true);
importHandleParam.setTaxAgentRanges(Collections.singletonList(taxAgentRangeSaveParam)); importHandleParam.setTaxAgentRanges(Collections.singletonList(taxAgentRangeSaveParam));
} else {
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + taxAgentRangeMsg);
excelComments.add(errorMessageMap);
// SalaryArchiveExcelBO.createExcelComment(excelComments, taxAgentRangeMsg, errorCount + 1, errorCount + 1, 0, 0);
isError = true;
return isError;
} }
// else {
// Map<String, String> errorMessageMap = Maps.newHashMap();
// errorMessageMap.put("message", rowindex + taxAgentRangeMsg);
// excelComments.add(errorMessageMap);
//// SalaryArchiveExcelBO.createExcelComment(excelComments, taxAgentRangeMsg, errorCount + 1, errorCount + 1, 0, 0);
// isError = true;
// return isError;
// }
} else { } else {
employeeId = optionalTaxAgentEmp.get().getEmployeeId(); employeeId = optionalTaxAgentEmp.get().getEmployeeId();
// 除了定薪中的初始化，其他导入存在相同的取第一条 // 除了定薪中的初始化，其他导入存在相同的取第一条