Site code now will be read from Site table's site_code__budget column against...

Site code now will be read from Site table's site_code__budget column against login site code same as site code.


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

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

@@ -26,7 +26,7 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 
 		String budgetId = null, confirmed = null;
 		String userId = null;
-		String chgTerm = null, chgUser = null;
+		String chgTerm = null, chgUser = null, loginSiteCode = null, siteCode = null;
 		
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -55,8 +55,9 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 			 userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "logincode");
 			 chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chg_term");
 			 chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chg_user");
+			 loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
 			 
-			 System.out.println("\n userId "+userId+"\t chgTerm : "+chgTerm+" chgUser : "+chgUser);
+			 System.out.println("\n userId "+userId+"\t chgTerm : "+chgTerm+" chgUser : "+chgUser+" loginSiteCode : "+loginSiteCode);
 			 			 
 			 //fromDateStr = genericUtility.getValidDateString( fromDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat() );
 			 
@@ -118,15 +119,39 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 				 this.closeResources(pstmt, rs);
 				 sql = null;
 				 
-				 //sql = "select acct_prd,code from period where sysdate between fr_date and to_date";
-				 sql = "select acct_prd,prd_code,fin_entity,site_code,from_date,to_date from budgets where budget_id= ?";
+				 // Getting site code against loginSiteCode from XTRA PARAMS
+				 
+				 sql = "select site_code__budget from site where site_code = ?";
+				 
+				 pstmt = conn.prepareStatement(sql);
+				 pstmt.setString(1,loginSiteCode);
+				 rs = pstmt.executeQuery();
+				 
+				 if(rs.next()){
+				 
+					siteCode = rs.getString(1);
+					
+				 }
+				 System.out.println("\n siteCode : "+siteCode);
+				 
+				 this.closeResources(pstmt, rs);
+				 sql = null;
+				 
+				 if(siteCode==null){
+					 
+					 errString = itmDBAccessEJB.getErrorString("","VTSITCODER",chgUser);
+					 return errString;
+					 
+				 }
+				 
+				 sql = "select acct_prd,prd_code,fin_entity,from_date,to_date from budgets where budget_id= ?";
 				 
 				 pstmt = conn.prepareStatement(sql);
 				 pstmt.setString(1,budgetId);
 				 rs = pstmt.executeQuery();
 				 
 				 String acctPrd = null, prdCode = null;
-				 String finEntity = null, siteCode = null;
+				 String finEntity = null;
 				 Date fromDate = null ,todate = null;
 				 
 				 if(rs.next()){
@@ -134,14 +159,13 @@ public class BudgetGrpAcctGenPrc extends ActionHandlerEJB implements BudgetGrpAc
 					acctPrd = rs.getString(1);
 					prdCode = rs.getString(2);
 					finEntity = rs.getString(3);
-					siteCode =  rs.getString(4);
-					fromDate = rs.getDate(5);
-					todate = rs.getDate(6);
+					fromDate = rs.getDate(4);
+					todate = rs.getDate(5);
 				 }
 				 
-				 System.out.println("\n acctPrd "+acctPrd+"  prdCode : "+prdCode+"  finEntity: "+finEntity+"  siteCode : "+siteCode+"  fromDate: "+fromDate+"  todate: "+todate);
+				 System.out.println("\n acctPrd "+acctPrd+"  prdCode : "+prdCode+"  finEntity: "+finEntity+"  fromDate: "+fromDate+"  todate: "+todate);
 				 
-				 if(acctPrd==null||prdCode==null||finEntity==null||siteCode==null||fromDate==null||todate==null){
+				 if(acctPrd==null||prdCode==null||finEntity==null||fromDate==null||todate==null){
 					 
 					 //Error : Required data not found from budgets
 					 errString = itmDBAccessEJB.getErrorString("","VTBUDINFNF",chgUser);