Merge branch 'MVP1.6.3' into develop

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java

@@ -906,19 +906,21 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 							value = column.getValue();
 							if (Common.isNotNull(value)) {
 								try {
-									if ("REDUCE".equals(detail.getFlag())) {
-										if (value.contains(",")) {
-											value = value.replace(",","");
+									if ("REDUCE".equals(detail.getFlag()) || "ADD".equals(detail.getFlag()) || "MAIN".equals(detail.getFlag())) {
+										if ("REDUCE".equals(detail.getFlag())) {
+											if (value.contains(",")) {
+												value = value.replace(",","");
+											}
+											value = String.valueOf(new BigDecimal(value).negate());
 										}
-										value = String.valueOf(new BigDecimal(value).negate());
-									}
-									oldValue = newRowMap.get(detail.getModelName());
-									if (Common.isNotNull(oldValue)) {
-										if (oldValue.contains(",")) {
-											oldValue = oldValue.replace(",","");
+										oldValue = newRowMap.get(detail.getModelName());
+										if (Common.isNotNull(oldValue)) {
+											if (oldValue.contains(",")) {
+												oldValue = oldValue.replace(",","");
+											}
+											value = String.valueOf(new BigDecimal(oldValue).add(new BigDecimal(value))
+													.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP));
 										}
-										value = String.valueOf(new BigDecimal(oldValue).add(new BigDecimal(value))
-												.setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP));
 									}
 								} catch (NumberFormatException e) {
 									return R.failed("数据行第 " + i + " 行，第 " + (Integer.parseInt(column.getKey()) + 1) + " 列 不是金额，不可以进行加减计算！");