Code enhanced which generates Accounts when multiple budget group code added...

Code enhanced which generates Accounts when multiple budget group code added at a time for a budget id in Budget Account Group Screen -> FI2KSUN004


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93195 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-fin/ibase/webitm/ejb/fin/BudgetGrpAcctGenPrc.java

@@ -28,8 +28,8 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 		String userId = null;
 		String chgTerm = null, chgUser = null, loginSiteCode = null, siteCode = null;
 		
-		PreparedStatement pstmt = null;
-		ResultSet rs = null;
+		PreparedStatement pstmtGrp =null, pstmt = null;
+		ResultSet rsGrp =null, rs = null;
 		
 		String sql = null;
 		String errString =  "";
@@ -50,7 +50,6 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 			 ConnDriver connDriver = new ConnDriver();
 			 conn = connDriver.getConnectDB( "DriverITM" );
 			 connDriver = null;
-			 conn.setAutoCommit( false );
 			
 			 userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "logincode");
 			 chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chg_term");
@@ -59,8 +58,6 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 			 
 			 System.out.println("\n userId "+userId+"\t chgTerm : "+chgTerm+" chgUser : "+chgUser+" loginSiteCode : "+loginSiteCode);
 			 			 
-			 //fromDateStr = genericUtility.getValidDateString( fromDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat() );
-			 
 			 sql = "select confirmed,budget_id from bud_grp_acct where tran_id= ?";
 			 
 			 pstmt = conn.prepareStatement(sql);
@@ -91,32 +88,32 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 				 
 				 String budgetGrpCode = null;
 				 Float budgetAmt = 0.00f;
-				 sql= null;
+
 				 sql = "select bgd.bud_group_code,bgd.budget_amt "+
 						 " from bud_grp_acct bga, bud_grp_acctdet bgd "+
 						 "where bgd.tran_id = ? " +
 						 " and bga.budget_id = ? " +
 						 "and bga.tran_id = bgd.tran_id ";
 				 
-				 System.out.println("\n sql1 :"+sql);
+				 System.out.println("\n sql => "+sql);
 				 
-				 pstmt = conn.prepareStatement(sql);
-				 pstmt.setString(1,tranID);
-				 pstmt.setString(2,budgetId);
-				 rs = pstmt.executeQuery();
+				 pstmtGrp = conn.prepareStatement(sql);
+				 pstmtGrp.setString(1,tranID);
+				 pstmtGrp.setString(2,budgetId);
+				 rsGrp = pstmtGrp.executeQuery();
 				 
-				 if(rs.next()){
+				 conn.setAutoCommit(false);
 				 
-					budgetGrpCode = rs.getString(1);
-					budgetAmt =  rs.getFloat(2);
-				 }
+				 while(rsGrp.next()){				// This loop will iterate through multiple budget group codes for a budget id 
+				 
+					 budgetGrpCode = rsGrp.getString(1);
+					 budgetAmt =  rsGrp.getFloat(2);
 				 
 					 if(budgetGrpCode!=null)
 						 budgetGrpCode = budgetGrpCode.trim();
 					 
 					 System.out.println("\n budgetGrpCode "+budgetGrpCode+"\t budgetAmt : "+budgetAmt);
 					 
-				 this.closeResources(pstmt, rs);
 					 sql = null;
 					 
 					/*
@@ -299,9 +296,7 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 							 String sqlCurrCode = null;
 							 String currCode = null;
 							 
-						 conn.setAutoCommit(false);
-						 
-						 while(rsData.next()){
+							 while(rsData.next()){  // This loop will iterate through multiple account codes for a budget group code in current iteration
 							 
 								deptCode = rsData.getString(1);
 								analCode = rsData.getString(2);
@@ -374,10 +369,9 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 								System.out.println("sqlInsert ------>>: "+sqlInsert);
 								
 								int rowInserted = pstmtInsert.executeUpdate();
-							/*if(rowInserted > 0)					
-								conn.commit();	*/					
 												
-							System.out.println(rowInserted + " row(s) inserted in ACCTBUDGET table.");
+								
+								System.out.println(rowInserted + " row(s) inserted in ACCTBUDGET table for budgetId : "+budgetId+" and budgetGrpCode : "+budgetGrpCode);
 								sqlInsert = null;
 								
 								if(pstmtInsert!=null){
@@ -385,14 +379,16 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 									pstmtInsert=null;
 								}
 								
-						 }			// while loop end
+							 }			// inner while loop end
+							 
+						  }				// End of else
+				 }	// End of outer while loop
+				 
 				 conn.commit();
 				 System.out.println("Committed...");
 				 
 				 errString = itmDBAccessEJB.getErrorString("","VTBUDACSUC",chgUser);
 				 return errString;
-					  }				// End of else
-				 
 			 }
              
 		}
@@ -418,6 +414,15 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 		{
 			try
 			{
+				if(rsGrp!=null){
+					rsGrp.close();
+					rsGrp = null;
+				}
+				if (pstmtGrp != null)
+				{
+					pstmtGrp.close();
+					pstmtGrp = null;
+				}		
 				if( rs != null )
 				{
 					rs.close();