Skip to content

B
business-java
Commit db8ee0df authored by sanashaikh's avatar sanashaikh
Browse files
Options

Sana S: Modified on 28/11/19 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212887 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2be878a0
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 26 deletions
webitm-adm/src/ibase/webitm/ejb/adm/LeaveConvertPrc.java
View file @ db8ee0df
......@@ -84,7 +84,7 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
//logWriter.setCurrentProcess("LeaveConvert");
logWriter.setActivity("LeaveConvertProcess");
logWriter.setProcessId("LeaveConvertProcess");
logWriter.setFileNameStartWith("");
logWriter.setFileNameStartWith("LeaveConvert");
currentProcess = logWriter.getCurrentProcess();
activity = logWriter.getActivity();
......@@ -93,10 +93,12 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
fileNameStartWith = logWriter.getFileNameStartWith();
System.out.println("fileNameStartWith ["+fileNameStartWith+"]");
logWriter.initializeHRLogWriter(objName, jobId, userId, termId, activity, "leaveConvert", loginSite, logConn);
////////
logWriter.initializeHRLogWriter(objName, jobId, userId, termId, activity, "LeaveConvert", loginSite, logConn);
//retStr = process(headerDom, detailDom,windowName,xtraParams, conn,logConn);//Modified by Sana S on 28/11/19
retStr = process(headerDom, detailDom,xtraParams,logWriter, conn,logConn);
retStr = process(headerDom, detailDom, windowName, xtraParams, conn,logConn);
System.out.println("Process for LeaveConvertPrc :::: " + retStr);
if(retStr == null || retStr.trim().length() == 0)
......@@ -136,15 +138,17 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
return retStr;
}
public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException
//Modified by Sana S on 28/11/19
//public String process(Document headerDom, Document detailDom, String windowName, String xtraParams, Connection conn, Connection logConn) throws RemoteException, ITMException
public String process(Document headerDom, Document detailDom, String xtraParams, HRLogWriter logWriter,Connection conn, Connection logConn) throws RemoteException, ITMException
{
HRLogWriter logWriter = new HRLogWriter();
//HRLogWriter logWriter = new HRLogWriter();//Modified by Sana S on 28/11/19
EmpLeaveConf empLeaveConf=new EmpLeaveConf();
SimpleDateFormat sdf=new SimpleDateFormat("dd/MM/yy");
ResultSet rs = null, rs1 = null, rs2 = null, rs3 = null ,rs4 = null;
PreparedStatement pstmt = null, pstmt1 = null, pstmt2 = null,pstmt3 = null;
String sql = "",sql1 = "" ,sql2 = "",sql3 = "",payrollOrVoucher="",payrollPeriod="";
ResultSet rs = null;
PreparedStatement pstmt = null;
String sql = "",payrollOrVoucher="",payrollPeriod="";
String errString = "";
String empCodeFr = "";
......@@ -162,14 +166,10 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
String keyString = "";
String tranId = "";
String userId = "";
String frDateStr = "",balDays="";
String balDays="";
Date expDate=null;
Timestamp ldRelieveDate=null;
Timestamp frDate = null;
Timestamp ldProcess = null,nextEff=null,nextEff1=null;
Timestamp ldEffDate = null;
Timestamp ldUptoDate = null;
Map dwDataMap = null;
Map dataMap = null;
......@@ -178,16 +178,12 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
int llRowCnt = 0,confirmed=0;
String lsEmpCode = "";
String workSite = "",lsDescr="";
String workSite = "";
double lcPrevBal = 0.0;
int cnt = 0;
String errCode = "",lveCodeConvert="",lveCodeOf="";
String lsLogText = "";
String lsEmpSite = "";
String lsWorkSite = "";
String xmlValues = "";
String jobId = "", loginSite = "",lveCodeoff=null;
String lveCodeoff=null;
StringBuffer valueXmlString = null;
try
......@@ -199,6 +195,8 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
conn = getConnection();
System.out.println("::::::::::::Inside Process::::::::::::");
logWriter.setCurrentProcess("LeaveConvertProcess");//Added by Sana S on 28/11/19
int liRet = logWriter.getLogWriterFlag();
if(liRet == -1)
......@@ -256,7 +254,7 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
else
{
errString = itmDBAccessEJB.getErrorString("","VTSEQ", userId, "", conn);
logWriter.gbfErrWrite("", "", "", "VTSEQ", "E", logConn);
logWriter.gbfErrWrite("", "", "", "VTSEQ", "E",logConn);
gbfReleaseLogWriter(headerDom, logWriter, logConn);
return errString;
......@@ -497,8 +495,14 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
errCode=empLeaveConf.leavesApprove(tranId, 2, checkNull(payrollOrVoucher), checkNull(payrollPeriod), 2, conn);
if(!errCode.equals(null) || errCode.trim().length()>0)
System.out.println("empLeaveConf error code:::"+errCode);
System.out.println("error code length:::"+errCode.trim().length());
//Modified by Sana S on 28/11/19
//if(!errCode.equals(null) || errCode.trim().length()>0)
if(errCode != null && errCode.trim().length()>0)
{
System.out.println(" "+errCode);
logWriter.gbfErrWrite("", lsEmpCode, "", errCode, "E", 2, logConn);
return errString;
}
......@@ -506,7 +510,7 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
if(errCode.trim().length() > 0)
{
conn.rollback();
System.out.println("rollback error code:::"+errCode);
errString = itmDBAccessEJB.getErrorString("", errCode, userId, "", conn);
rejected=rejected+1;
return errString;
......@@ -605,7 +609,6 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
String sql =null,retriveSql=null,sql1 =null,sql3 =null;
Connection conn = null;
int rowCount=0;
String siteCodeTo = null;
String siteCodeFrom = null;
String deptCodeTo = null;
......@@ -628,7 +631,6 @@ public class LeaveConvertPrc extends ProcessEJB implements LeaveConvertPrcLocal,
Map dataMap = null;
int rowCnt = 0,rejected=0;
Map<Object, Object> rowMap = null;
int llRowCnt = 0,confirmed=0;
try
{
......
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