Commit 235c62c2 authored by hongguangwu's avatar hongguangwu

MVP1.5.1-优化薪资导入

parent e82f5938
...@@ -457,6 +457,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -457,6 +457,7 @@ public class SalaryAccountUtil implements Serializable {
TSalaryEmployee otherEmp; TSalaryEmployee otherEmp;
List<TSalaryEmployee> saveNewEmpList = new ArrayList<>(); List<TSalaryEmployee> saveNewEmpList = new ArrayList<>();
List<String> checkTaxMonthList = new ArrayList<>(); List<String> checkTaxMonthList = new ArrayList<>();
boolean isContinue = true;
if (!newEmpList.isEmpty()) { if (!newEmpList.isEmpty()) {
TSalaryEmployee newEmps; TSalaryEmployee newEmps;
for (int i = 0; i < newEmpList.size(); i++) { for (int i = 0; i < newEmpList.size(); i++) {
...@@ -489,10 +490,13 @@ public class SalaryAccountUtil implements Serializable { ...@@ -489,10 +490,13 @@ public class SalaryAccountUtil implements Serializable {
, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()) , CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime())
, CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee()) , CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee())
, otherEmp.getEmpName(), entity.getSalaryStyle() , otherEmp.getEmpName(), entity.getSalaryStyle()
, nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums())) return; , nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums())) {
isContinue = false;
} }
} }
} }
}
if (isContinue) {
int nowYear = Integer.parseInt(nowMonth.substring(0, 4)); int nowYear = Integer.parseInt(nowMonth.substring(0, 4));
Map<String, String> minTaxMonthMap = tSalaryAccountService.getMinTaxMonthByNowYearAndList(checkTaxMonthList, nowYear); Map<String, String> minTaxMonthMap = tSalaryAccountService.getMinTaxMonthByNowYearAndList(checkTaxMonthList, nowYear);
String minTaxMonth; String minTaxMonth;
...@@ -519,6 +523,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -519,6 +523,7 @@ public class SalaryAccountUtil implements Serializable {
tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList); tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
} }
} }
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("将jsonString数据源的数据导入到list异常!"); log.error("将jsonString数据源的数据导入到list异常!");
......
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