Commit c2bc5068 authored by hongguangwu's avatar hongguangwu

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

parent 1455e78c
...@@ -745,7 +745,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -745,7 +745,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP)); .setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP));
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return R.failed("第 " + i + " 行,第 " + (Integer.parseInt(column.getKey()) + 1) + " 列 不是金额,不可以进行加减计算!"); return R.failed("数据行第 " + i + " 行,第 " + (Integer.parseInt(column.getKey()) + 1) + " 列 不是金额,不可以进行加减计算!");
} }
newRowMap.put(detail.getModelName(), value); newRowMap.put(detail.getModelName(), value);
if (SalaryConstants.ID_NUMBER.equals(detail.getModelName())) { if (SalaryConstants.ID_NUMBER.equals(detail.getModelName())) {
...@@ -757,10 +757,10 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -757,10 +757,10 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
} }
} }
if (Common.isEmpty(check.getIdCard())) { if (Common.isEmpty(check.getIdCard())) {
return R.failed("第 " + i + " 行,无身份证号!"); return R.failed("数据行第 " + i + " 行,无身份证号!");
} }
if (Common.isEmpty(check.getName())) { if (Common.isEmpty(check.getName())) {
return R.failed("第 " + i + " 行,无员工姓名!"); 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