汇总表累计收入显示负数问题

汇总表增加一列显示超额完成收入

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TemplateOptionServiceImpl.java

@@ -124,6 +124,7 @@ public class TemplateOptionServiceImpl implements TemplateOptionService {
                 fundIncomeInfo.setUpdateTime(model.getUpdateTime());
                 fundIncomeInfo.setUpdateBy(model.getUpdateBy());
                 fundIncomeInfo.setName(model.getName());
+                fundIncomeInfo.setSerialNumber(model.getSerialNum());
 
                 fundIncomeInfoDAO.update(fundIncomeInfo);
             }

web/src/main/java/com/jpsoft/employment/modules/base/controller/FundIncomeInfoController.java

@@ -1073,12 +1073,18 @@ public class FundIncomeInfoController {
 
 
                 BigDecimal accumulatedArrears = BigDecimal.ZERO;
+
                 if (sumCurBudgetRevenue != null) {
                     if (actualTotalRevenue != null) {
                         accumulatedArrears = sumCurBudgetRevenue.subtract(actualTotalRevenue);
                     } else {
                         accumulatedArrears = sumCurBudgetRevenue;
                     }
+
+                    if (accumulatedArrears.compareTo(BigDecimal.ZERO) < 0) {
+                        map.put("overIncome",accumulatedArrears.abs());
+                        accumulatedArrears = BigDecimal.ZERO;
+                    }
                 }
 
                 //累计欠费