MITKC-2124- RRbudget form basesalary by period data printing issue fixed

kuali · Sep 3, 2015 · 6b3209a · 6b3209a
1 parent 2e0f599
commit 6b3209a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/budget/S2SBudgetCalculatorServiceImpl.java b/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/budget/S2SBudgetCalculatorServiceImpl.java
@@ -2005,7 +2005,9 @@ else if (personDetails.getPeriodTypeCode().equals(
                     }
                     BudgetPersonContract budgetPerson = personDetails.getBudgetPerson();
                     if (budgetPerson != null) {
-                        baseAmount = budgetPerson.getCalculationBase();
+                    	ScaleTwoDecimal baseSalaryByPeriod = getBaseSalaryByPeriod(budget.getBudgetId(), budgetPeriod.getBudgetPeriod(), keyPerson);
+                    	if(baseSalaryByPeriod!=null){
+                    		baseAmount = baseSalaryByPeriod;
                         // baseAmount must be set to the first record value in
                         // case
                         // the execution doesnt enter the if condition below
@@ -2014,8 +2016,9 @@ else if (personDetails.getPeriodTypeCode().equals(
                                 ConfigurationConstants.S2SBUDGET_APPOINTMENT_TYPE_SUM_EMPLOYEE))
                                 && !apptTypeCode.equals(s2SConfigurationService.getValueAsString(
                                 ConfigurationConstants.S2SBUDGET_APPOINTMENT_TYPE_TMP_EMPLOYEE))) {
-                            baseAmount = budgetPerson.getCalculationBase();
+                        	baseAmount = baseSalaryByPeriod;
                         }
+                    	}
                     }
                 }