Commit bc0c2fe7 authored by hongguangwu's avatar hongguangwu

MVP1.5.4-薪资优化

parent 3b08fc13
...@@ -495,10 +495,10 @@ public class SalaryAccountUtil implements Serializable { ...@@ -495,10 +495,10 @@ public class SalaryAccountUtil implements Serializable {
, entity, salaryType, dept, user, entity.getSalaryStyle() , entity, salaryType, dept, user, entity.getSalaryStyle()
, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()), invoiceTitle , CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()), invoiceTitle
, entity.getSaiList(), bankMap)) { , entity.getSaiList(), bankMap)) {
isContinue = false;
continue; continue;
} }
newEmps.setSalaryGiveTime(entity.getSalaryGiveTime()); newEmps.setSalaryGiveTime(entity.getSalaryGiveTime());
log.error(newEmps.getEmpName());
saveNewEmpList.add(newEmps); saveNewEmpList.add(newEmps);
checkTaxMonthList.add(newEmps.getEmpIdcard()); checkTaxMonthList.add(newEmps.getEmpIdcard());
} else { } else {
...@@ -509,6 +509,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -509,6 +509,7 @@ public class SalaryAccountUtil implements Serializable {
error = "第" + (newEmps.getLineNums() + 2) + "行:薪酬人员查询菜单无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!"; error = "第" + (newEmps.getLineNums() + 2) + "行:薪酬人员查询菜单无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!";
errorList.add(new ErrorMessage(newEmps.getLineNums() + 2, error)); errorList.add(new ErrorMessage(newEmps.getLineNums() + 2, error));
} }
isContinue = false;
} }
} else { } else {
// 使用emp信息 // 使用emp信息
...@@ -981,14 +982,9 @@ public class SalaryAccountUtil implements Serializable { ...@@ -981,14 +982,9 @@ public class SalaryAccountUtil implements Serializable {
} }
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankCity().trim() areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankCity().trim()
+ CommonConstants.DOWN_LINE_STRING + entity.getBankProvince().trim()); + CommonConstants.DOWN_LINE_STRING + entity.getBankProvince().trim());
log.error("entity.getBankCity():"+entity.getBankCity());
log.error("entity.getBankProvince():"+entity.getBankProvince());
log.error("areaStr:"+areaStr);
if (Common.isNotNull(areaStr)) { if (Common.isNotNull(areaStr)) {
newEmp.setBankCity(areaStr); newEmp.setBankCity(areaStr);
log.error("1:areaStr:"+areaStr);
} else { } else {
log.error("2:开户行市错误:"+areaStr);
error = "第" + (i + 2) + "行:" + newEmpStr + "-开户行市错误:" + entity.getBankCity(); error = "第" + (i + 2) + "行:" + newEmpStr + "-开户行市错误:" + entity.getBankCity();
errorList.add(new ErrorMessage((i + 2), error)); errorList.add(new ErrorMessage((i + 2), error));
return false; return false;
...@@ -1245,7 +1241,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -1245,7 +1241,7 @@ public class SalaryAccountUtil implements Serializable {
method = Class.forName(clazz.getClass().getName()).getDeclaredMethod("get" + methodName); method = Class.forName(clazz.getClass().getName()).getDeclaredMethod("get" + methodName);
return method.invoke(clazz); return method.invoke(clazz);
} catch (Exception e) { } catch (Exception e) {
log.error("执行某个Field的getField方法异常!", e); log.error("执行某个Field的getField方法异常!!", e);
return ""; return "";
} }
} }
......
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