Commit ec9092bb authored by hongguangwu's avatar hongguangwu

MVP1.6.2-工资原表识别-优化

parent e2c1b315
...@@ -695,7 +695,16 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -695,7 +695,16 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
title = vo.getTitleList().get(i); title = vo.getTitleList().get(i);
if (Common.isNotNull(title.getContent())) { if (Common.isNotNull(title.getContent())) {
if (detailMap.get(String.valueOf(title.getLineNum())) == null) { if (detailMap.get(String.valueOf(title.getLineNum())) == null) {
return R.failed("表头与导入的不一致,第" + title.getLineNum() + "列表头【" + title.getContent() + "】未找到配置,请先配置表头!"); if (!"是否新员工(默认否)".equals(title.getContent())
&& !"开户行总行".equals(title.getContent())
&& !"开户行省".equals(title.getContent())
&& !"开户行市".equals(title.getContent())
&& !"开户行支行".equals(title.getContent())
&& !"银行卡号".equals(title.getContent())
&& !"手机号码".equals(title.getContent())
&& !"计税月份".equals(title.getContent())) {
return R.failed("表头与导入的不一致,第" + title.getLineNum() + "列表头【" + title.getContent() + "】未找到配置,请先配置表头!");
}
} else if (!title.getContent().equals(detailMap.get(String.valueOf(title.getLineNum())).getExcelName()) } else if (!title.getContent().equals(detailMap.get(String.valueOf(title.getLineNum())).getExcelName())
&& (!"是否新员工(默认否)".equals(title.getContent()) && (!"是否新员工(默认否)".equals(title.getContent())
|| !"开户行总行".equals(title.getContent()) || !"开户行总行".equals(title.getContent())
......
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