Commit 288afaa9 authored by hongguangwu's avatar hongguangwu

MVP1.6.3 特殊导入

parent 93e3b20b
......@@ -853,12 +853,13 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
detail = detailMap.get(column.getKey());
if (detail != null && Common.isNotNull(detail.getModelName())) {
value = column.getValue();
if (Common.isNotNull(value)) {
try {
if ("REDUCE".equals(detail.getFlag())) {
value = String.valueOf(new BigDecimal(value).negate());
}
oldValue = newRowMap.get(detail.getModelName());
if (oldValue != null) {
if (Common.isNotNull(oldValue)) {
value = String.valueOf(new BigDecimal(oldValue).add(new BigDecimal(value))
.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP));
}
......@@ -874,6 +875,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
}
}
}
}
if (Common.isEmpty(check.getIdCard())) {
return R.failed("数据行第 " + i + " 行,无身份证号!");
}
......
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