Commit f7434a62 authored by ssalve's avatar ssalve

Sarita : Done changes to 1. remove Lookup for ITMDBAccessEJB and created...

Sarita : Done changes to 1. remove Lookup for ITMDBAccessEJB and created object and  2. use connection method of ITMDBAccessEJB for calling getErrorString 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@187968 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5860b986
...@@ -98,11 +98,13 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -98,11 +98,13 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
Timestamp confDate=null; Timestamp confDate=null;
InitialContext initialCtx = null; InitialContext initialCtx = null;
ITMDBAccessLocal itmDBAccess = null; //ITMDBAccessLocal itmDBAccess = null; //Commented by sarita on 20 JULY 18
AppConnectParm appConnect = null; AppConnectParm appConnect = null;
AdmCommon admCommon=null; AdmCommon admCommon=null;
PayrollVoucherConfLocal payrollVoucherConf = null; //Commented by sarita on 20 JULY 18 to create object of PayrollVoucherConfLocal [START]
//PayrollVoucherConfLocal payrollVoucherConf = null;
PayrollVoucherConf payrollVoucherConf = new PayrollVoucherConf();
//Commented by sarita on 20 JULY 18 to create object of PayrollVoucherConfLocal [END]
boolean latestTran=true; boolean latestTran=true;
ArrayList<String> errList = new ArrayList<String>(); ArrayList<String> errList = new ArrayList<String>();
...@@ -139,14 +141,16 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -139,14 +141,16 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
try try
{ {
connDriver = new ConnDriver();
connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
conn.setAutoCommit(false); conn.setAutoCommit(false);
//Commented by sarita to create object of ITMDBAccessEJB instead ITMDBAccessLocal on 20 JULY 18.[START]
appConnect = new AppConnectParm(); /* appConnect = new AppConnectParm();
initialCtx = new InitialContext(appConnect.getProperty()); initialCtx = new InitialContext(appConnect.getProperty());
itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local"); itmDBAccess = (ITMDBAccessLocal)initialCtx.lookup("ibase/ITMDBAccessEJB/local");*/
//Commented by sarita to create object of ITMDBAccessEJB instead ITMDBAccessLocal on 20 JULY 18.[END]
UtilMethods uMth=new UtilMethods(); UtilMethods uMth=new UtilMethods();
...@@ -485,7 +489,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -485,7 +489,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
if(dayDiff!=0) if(dayDiff!=0)
{ {
errString = itmDBAccess.getErrorString("", "VTSTDTDIFF", "", "", conn); //Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VTSTDTDIFF", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VTSTDTDIFF", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
return errString; return errString;
} }
} }
...@@ -493,7 +500,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -493,7 +500,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
if("S".equalsIgnoreCase(empStatus)) if("S".equalsIgnoreCase(empStatus))
{ {
errString = itmDBAccess.getErrorString("", "VTEMPSEPRT", "", "", conn); //Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VTEMPSEPRT", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VTEMPSEPRT", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
return errString; return errString;
} }
...@@ -544,7 +554,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -544,7 +554,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
autoPost=getAutoPostValue(empCode,"AUTO_POST",conn); autoPost=getAutoPostValue(empCode,"AUTO_POST",conn);
if("NULLFOUND".equalsIgnoreCase(autoPost)) if("NULLFOUND".equalsIgnoreCase(autoPost))
{ {
errString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", conn); //Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VSENVAR1", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VSENVAR1", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
return errString; return errString;
} }
...@@ -691,7 +704,8 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -691,7 +704,8 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
if("Y".equalsIgnoreCase(autoPost)) if("Y".equalsIgnoreCase(autoPost))
{ {
payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local"); //Commented by sarita to remove lookup for PayrollVoucherConf and use object instead on 20 JULY 18.
//payrollVoucherConf = (PayrollVoucherConfLocal)initialCtx.lookup("ibase/PayrollVoucherConf/local");
retString = checkNull(payrollVoucherConf.confirm(newVouchNo, forcedFlag, xtraParams, conn)); retString = checkNull(payrollVoucherConf.confirm(newVouchNo, forcedFlag, xtraParams, conn));
} }
//Changed By Santosh Gupta purposed to retrive old data of employee (10/4/17) //Changed By Santosh Gupta purposed to retrive old data of employee (10/4/17)
...@@ -793,7 +807,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit ...@@ -793,7 +807,10 @@ public class EmpMaritalStatusCancel extends ActionHandlerEJB implements EmpMarit
if(updateMaritalChgCount>0) if(updateMaritalChgCount>0)
{ {
errString = itmDBAccess.getErrorString("", "VTCANSUCSS", "", "", conn); //Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [START]
//errString = itmDBAccess.getErrorString("", "VTCANSUCSS", "", "", conn);
errString = itmDBAccessEJB.getErrorString("", "VTCANSUCSS", "", "", conn);
//Added and commented by sarita on to call itmDBAccessEJB for getErrorString connection method on 20 JULY 2018 [END]
} }
} // NO ERROR in REVERCE VOUCHER } // NO ERROR in REVERCE VOUCHER
} // NO ERROR BEFORE EXECUTION. } // NO ERROR BEFORE EXECUTION.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment