Changes done in PayStruChgReqConfirm.java & PayStruChgReqSubmit.java

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

webitm-adm/src/ibase/webitm/ejb/adm/adv/PayStruChgReqConfirm.java

@@ -30,7 +30,6 @@ import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.adm.AdmCommon;
 import ibase.webitm.utility.DB2XMLGenerator;
-import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.TransIDGenerator;
 import ibase.utility.UserInfoBean;
@@ -85,7 +84,8 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 				e3.printStackTrace();
 			}
 			System.out.println("Exception :PayStruChgReqConfirm :confirm():" + e.getMessage() + ":");
-			retString = GenericUtility.getInstance().createErrorString(e);
+			// retString = GenericUtility.getInstance().createErrorString(e);
+			retString = genericUtility.createErrorString(e);
 			e.printStackTrace();
 			throw new ITMException(e);
 		}
@@ -137,6 +137,76 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 				transInfoXml = "";
 			}
 
+			// retString = postLogic(tranId, xtraParams, forcedFlag, conn);
+			retString = confirm(tranId, xtraParams, forcedFlag, transInfoXml, conn);
+			System.out.println("retString from confirm(tranId, xtraParams, forcedFlag, transInfoXml, conn) : "+retString);
+
+			/*
+			if(retString != null  && retString.trim().length() > 0)
+			{
+				conn.rollback();
+			}
+			else
+			{
+				conn.commit();
+				if (transInfoXml != null && transInfoXml.trim().length() > 0)
+				{
+					try
+					{
+						doMailActivity(tranId , transInfoXml, userInfoStr, "PYALCCONFM", "EMP", "HR", xtraParams, conn);
+					}
+					catch (Exception e2)
+					{
+						System.out.println("Exception :PayStruChgReqConfirm :confirm():" + e2.getMessage() + ":");
+						e2.printStackTrace();
+					}
+				}
+				// retString = itmDbAcess.getErrorString("","VTSUCC" , userId, "", conn);		
+				retString = itmDbAcess.getErrorString("","VTPAYALC25" , userId, "", conn);		
+				return retString;
+			}
+			*/
+		}
+		catch(Exception e)
+		{
+			try
+			{
+				if (conn != null)
+				{
+					conn.rollback();
+				}
+			}
+			catch (Exception e3)
+			{
+				System.out.println("Exception :PayStruChgReqConfirm :confirm():" + e3.getMessage() + ":");
+				e3.printStackTrace();
+			}
+			System.out.println("Exception :PayStruChgReqConfirm :confirm():" + e.getMessage() + ":");
+			// retString = GenericUtility.getInstance().createErrorString(e);
+			retString = genericUtility.createErrorString(e);
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+		}
+		return retString;
+	}
+
+	public String confirm(String tranId, String xtraParams, String forcedFlag, String transInfoXml, Connection conn) throws RemoteException,ITMException
+	{
+		String retString = "";
+		ITMDBAccessEJB itmDbAcess = new ITMDBAccessEJB();
+		String userId = "";
+		DBAccessEJB dbAccessEJB = new DBAccessEJB();
+		String userInfoStr = "";
+		E12GenericUtility genericUtility = new E12GenericUtility();
+		try
+		{
+			System.out.println(":::Inside PayStruChgReqConfirm : confirm():::");
+
+			userId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
+
 			retString = postLogic(tranId, xtraParams, forcedFlag, conn);
 			System.out.println("retString from postLogic : "+retString);
 
@@ -179,7 +249,8 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 				e3.printStackTrace();
 			}
 			System.out.println("Exception :PayStruChgReqConfirm :confirm():" + e.getMessage() + ":");
-			retString = GenericUtility.getInstance().createErrorString(e);
+			// retString = GenericUtility.getInstance().createErrorString(e);
+			retString = genericUtility.createErrorString(e);
 			e.printStackTrace();
 			throw new ITMException(e);
 		}
@@ -189,6 +260,7 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 		return retString;
 	}
 
+	
 	private String postLogic(String Tranid,String xtraParams,String forcedFlag,Connection conn) throws ITMException
 	{
 		String lsConf = "";
@@ -643,7 +715,8 @@ public class PayStruChgReqConfirm extends ActionHandlerEJB implements PayStruChg
 		try
 		{
 			conn.setAutoCommit(false);
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility = new E12GenericUtility();
 
 			updSql = "insert into EMPLOYEE_AD (EMP_CODE,AD_CODE,EFF_DATE,EXP_DATE,AMOUNT,TYPE,CHG_DATE,CHG_USER,CHG_TERM,TRAN_ID,MAX_BASIC,MIN_AMT,MIN_BASIC,MAX_AMT,CONFIRMED,PROP_YN, REF_TYPE,CONF_DATE,EMP_CODE__APRV) values(?,?,?,?,?,?,SYSDATE,?,?,?,?,?,?,?,?,?,?,SYSDATE,?)";
 			System.out.println("Insert sql In [empPrevRec][updSql][1]........:: " + updSql);

webitm-adm/src/ibase/webitm/ejb/adm/adv/PayStruChgReqSubmit.java

@@ -399,7 +399,7 @@ public class PayStruChgReqSubmit extends ValidatorEJB implements PayStruChgReqSu
 			}
 			else if (hrAction.trim().equalsIgnoreCase("A"))
 			{
-				returnString = payStruChgReqConfirm.confirm(Tranid, forcedFlag, xtraParams, conn);
+				returnString = payStruChgReqConfirm.confirm(Tranid, xtraParams, forcedFlag, conn);
 			}
 			else if (hrAction.trim().equalsIgnoreCase("R"))
 			{