Skip to content

Y
yifu-mvp
Commit 911423b6 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge branch 'MVP1.6.3' into develop

parents e7b24ac1 9e7a40fe
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @ 911423b6
...@@ -906,6 +906,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -906,6 +906,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
value = column.getValue(); value = column.getValue();
if (Common.isNotNull(value)) { if (Common.isNotNull(value)) {
try { try {
if ("REDUCE".equals(detail.getFlag()) || "ADD".equals(detail.getFlag()) || "MAIN".equals(detail.getFlag())) {
if ("REDUCE".equals(detail.getFlag())) { if ("REDUCE".equals(detail.getFlag())) {
if (value.contains(",")) { if (value.contains(",")) {
value = value.replace(",",""); value = value.replace(",","");
...@@ -920,6 +921,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -920,6 +921,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
value = String.valueOf(new BigDecimal(oldValue).add(new BigDecimal(value)) value = String.valueOf(new BigDecimal(oldValue).add(new BigDecimal(value))
.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) + " 列 不是金额，不可以进行加减计算！");
} }
......
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