Skip to content

B
business-java
Commit ac5e15fd authored by akhokar's avatar akhokar
Browse files
Options

Changes done due hrLogWriter related changes 

EmpITConfPrc.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212794 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3618f43d
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 7 deletions
webitm-adm/src/ibase/webitm/ejb/adm/EmpITConfPrc.java
View file @ ac5e15fd
...@@ -303,7 +303,9 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -303,7 +303,9 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
//retStr = process(headerDom, detailDom, xtraParams); //retStr = process(headerDom, detailDom, xtraParams);
retStr = process(headerDom, detailDom, xtraParams,hrLogWriter,conn,logConn); retStr = process(headerDom, detailDom, xtraParams,hrLogWriter,conn,logConn);
System.out.println("Process forEmpITConfPrc ::"+retStr); System.out.println("Process forEmpITConfPrc ::"+retStr);
gbfDestructProcess(headerDom,hrLogWriter, logConn); //Modified by Azhar K on [27-11-19][Changes done as per piyush sir][Start]
//gbfDestructProcess(headerDom,hrLogWriter, logConn);
//Modified by Azhar K on [27-11-19][Changes done as per piyush sir][End]
//Modified by Rohini T on 26/08/19[End] //Modified by Rohini T on 26/08/19[End]
} }
catch (Exception e) catch (Exception e)
...@@ -312,7 +314,29 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -312,7 +314,29 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
//Added by Azhar K. on [27-11-19][Closing the connections][Start]
finally
{
try
{
if(conn != null)
{
conn.close();
conn = null;
}
if(logConn != null)
{
logConn.close();
logConn = null;
}
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
}
//Added by Azhar K. on [27-11-19][Closing the connections][End]
return retStr; return retStr;
}//END OF PROCESS (1) }//END OF PROCESS (1)
//Modified by Rohini T on 26/08/19[Start] //Modified by Rohini T on 26/08/19[Start]
...@@ -388,7 +412,10 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -388,7 +412,10 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
{ {
errString = itmDBAccessEJB.getErrorString("","VTBLNKDTL","","",conn); errString = itmDBAccessEJB.getErrorString("","VTBLNKDTL","","",conn);
//Modified by Rohini T on 29/08/19[Start] //Modified by Rohini T on 29/08/19[Start]
hrLogWriter.gbfErrWrite("", "", "", "VTBLNKDTL", "E", 2, logconn); //Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
//hrLogWriter.gbfErrWrite("", "", "", "VTBLNKDTL", "E", 2, logconn);
hrLogWriter.gbfErrWrite("", "", "", "VTBLNKDTL", "E", logconn);
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
//Modified by Rohini T on 29/08/19[End] //Modified by Rohini T on 29/08/19[End]
return errString; return errString;
} }
...@@ -429,12 +456,18 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -429,12 +456,18 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
}*/ }*/
if((errorCode !=null && errorCode.trim().length() > 0 ) && (!(errorCode.contains("VPSUCC1")))) if((errorCode !=null && errorCode.trim().length() > 0 ) && (!(errorCode.contains("VPSUCC1"))))
{ {
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
conn.rollback();
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
//totConfRec = totConfRec + 1; //totConfRec = totConfRec + 1;
totRejRec = totRejRec + 1;//Added by Sana S on 16/10/19 totRejRec = totRejRec + 1;//Added by Sana S on 16/10/19
isError = true; isError = true;
} }
else else
{ {
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
conn.commit();
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
//totRejRec = totRejRec + 1; //totRejRec = totRejRec + 1;
totConfRec = totConfRec + 1;//Added by Sana S on 16/10/19 totConfRec = totConfRec + 1;//Added by Sana S on 16/10/19
isError = false; isError = false;
...@@ -466,6 +499,9 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -466,6 +499,9 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
System.out.println("Closing Connection...."); System.out.println("Closing Connection....");
try try
{ {
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
gbfDestructProcess(headerDom,hrLogWriter, logconn);
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
if(isError) if(isError)
{ {
conn.rollback(); conn.rollback();
...@@ -474,11 +510,13 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -474,11 +510,13 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
{ {
conn.commit(); conn.commit();
} }
if(conn != null) //Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
/*if(conn != null)
{ {
conn.close(); conn.close();
conn = null; conn = null;
} }*/
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -521,6 +559,10 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -521,6 +559,10 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
SimpleDateFormat sdf1 = null; SimpleDateFormat sdf1 = null;
java.sql.Timestamp currentDate = null,today = null; java.sql.Timestamp currentDate = null,today = null;
UtilMethods utilMethod = new UtilMethods(); UtilMethods utilMethod = new UtilMethods();
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
ResultSet rs = null;
String confirmed = "";
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
try try
{ {
java.sql.Date todayDt = new java.sql.Date(System.currentTimeMillis()); java.sql.Date todayDt = new java.sql.Date(System.currentTimeMillis());
...@@ -535,6 +577,37 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -535,6 +577,37 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"); loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
System.out.println("loginEmpCode is ==="+loginEmpCode + "currentDate is ===" +currentDate); System.out.println("loginEmpCode is ==="+loginEmpCode + "currentDate is ===" +currentDate);
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
sql = "select case when confirmed is null then '' else confirmed end as confirmed from it_calchdr "+
" where acct_prd = ? and emp_code = ? for update nowait";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, acctPrd);
pstmt.setString(2, empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
confirmed = checkNullAndTrim(rs.getString("confirmed"));
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if("Y".equalsIgnoreCase(confirmed))
{
retString = "TRNADYCONF";
hrLogWriter.gbfErrWrite(acctPrd, empCode, "", "TRNADYCONF", "E", 2, logconn);
return retString;
}
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
sql = "update it_calchdr set confirmed = ? , emp_code__aprv = ?, conf_date = ? " sql = "update it_calchdr set confirmed = ? , emp_code__aprv = ?, conf_date = ? "
+ "where acct_prd = ? and emp_code = ?"; + "where acct_prd = ? and emp_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -611,7 +684,13 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI ...@@ -611,7 +684,13 @@ public class EmpITConfPrc extends ProcessEJB implements EmpITConfPrcLocal,EmpI
finally finally
{ {
try try
{ //Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][Start]
if(rs != null)
{ {
rs.close();
rs = null;
}
//Modified by Azhar K. on[27-11-19][Changes done as per piyush sir][End]
if(pstmt != null) if(pstmt != null)
{ {
pstmt.close(); pstmt.close();
......
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