Skip to content

B
business-java
Commit 09fa1adb authored by gahmad's avatar gahmad
Browse files
Options

Changes made for req ID : AD90SUN017 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91317 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 46a9cd22
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 14 deletions
webitm-adm/ibase/webitm/ejb/adm/.project 0 → 100755
View file @ 09fa1adb
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>adm</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
webitm-adm/ibase/webitm/ejb/adm/SepClose.java
View file @ 09fa1adb
...@@ -297,6 +297,35 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -297,6 +297,35 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
System.out.println("Exception ::"+e); System.out.println("Exception ::"+e);
e.printStackTrace(); e.printStackTrace();
} }
//Added below by Raj (AD90SUN017)- 12/05/2010
finally
{
try
{
if (rs != null)
{
rs.close();
rs = null;
}
if (rs1 != null)
{
rs1.close();
rs1 = null;
}
if (stmt != null)
{
stmt.close();
stmt = null;
}
if (conn != null)
{
conn.close();
conn = null;
}
}
catch(Exception e){}
}
//Addition ended by Raj (AD90SUN017)- 12/05/2010
System.out.println("ErrString ::"+errString); System.out.println("ErrString ::"+errString);
return errString; return errString;
}//END OF VALIDATION }//END OF VALIDATION
...@@ -353,6 +382,16 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -353,6 +382,16 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
StringBuffer retString = new StringBuffer(); StringBuffer retString = new StringBuffer();
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
System.out.println("xtraParams::::::::::::::::"+xtraParams); System.out.println("xtraParams::::::::::::::::"+xtraParams);
//Added below by Raj (AD90SUN017)- 12/05/2010
String status = "";
String sepMode = "";
String reason = "";
String vacNoCreated = "";
String confDate = "";
String empCodeConf = "";
String reliveDate = "";
//Addition ended by Raj (AD90SUN017)- 12/05/2010
try try
{ {
connSep = getConnection(); connSep = getConnection();
...@@ -436,9 +475,11 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -436,9 +475,11 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
valueXmlString.append("<Detail1>"); valueXmlString.append("<Detail1>");
String siteDescr = ""; String siteDescr = "";
String dateStr = ""; String dateStr = "";
String reliveDateStr=""; //String reliveDateStr="";//Remarked by Raj (AD90SUN017)- 13/05/2010
String firstName=""; String firstName="";
String lastName=""; String lastName="";
String approverfirstName = ""; //Added by Raj (AD90SUN017)- 12/05/2010
String approverlastName = ""; //Added by Raj (AD90SUN017)- 12/05/2010
Object date = null; Object date = null;
loginSite = "";//Added by jaimin on 17/07/2008 (AD89SUN025) loginSite = "";//Added by jaimin on 17/07/2008 (AD89SUN025)
String sepFound = "N"; // Added by Raj - Req.ID: ADM5000192 - 27/05/08 String sepFound = "N"; // Added by Raj - Req.ID: ADM5000192 - 27/05/08
...@@ -447,8 +488,9 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -447,8 +488,9 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
java.sql.Date rDate = null;//new java.sql.Date(); java.sql.Date rDate = null;//new java.sql.Date();
//sql = "SELECT RESI_DATE FROM SEPARATION WHERE EMP_CODE = '"+columnValue.trim()+"'"; // Remarked by Raj - Req. ID. ADM5000192 - 27/05/08 //sql = "SELECT RESI_DATE FROM SEPARATION WHERE EMP_CODE = '"+columnValue.trim()+"'"; // Remarked by Raj - Req. ID. ADM5000192 - 27/05/08
sepFound = "N"; // Added by Raj - Req.ID: ADM5000192 - 27/05/08 sepFound = "N"; // Added by Raj - Req.ID: ADM5000192 - 27/05/08
sql = "SELECT RESI_DATE FROM SEPARATION WHERE EMP_CODE = '"+columnValue.trim()+"' AND STATUS = 'C'"; // Added STATUS CLAUSE IN WHERE CONDITION by Raj - Req.ID: ADM5000192 - 27/05/08 //sql = "SELECT RESI_DATE FROM SEPARATION WHERE EMP_CODE = '"+columnValue.trim()+"' AND STATUS = 'C'"; // Added STATUS CLAUSE IN WHERE CONDITION by Raj - Req.ID: ADM5000192 - 27/05/08 ////Remarked by Raj (AD90SUN017)- 08/05/2010
System.out.println("Sql For Resignation Date :::["+sql+"]"); sql = "SELECT RESI_DATE, STATUS, RELIEVE_DATE, SEPARATION_MODE, REASON, VAC_NO__CREATED, CONF_DATE, EMP_CODE__CONF FROM SEPARATION WHERE EMP_CODE = '"+columnValue.trim()+"' AND STATUS = 'C'"; //Added by Raj (AD90SUN017)- 08/05/2010
System.out.println("Sql For Separation Details :::["+sql+"]");
stmtSep = connSep.createStatement(); stmtSep = connSep.createStatement();
rsSep = stmtSep.executeQuery(sql); rsSep = stmtSep.executeQuery(sql);
while (rsSep.next()) while (rsSep.next())
...@@ -457,18 +499,60 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -457,18 +499,60 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
date = sdf.parse(rDate.toString()); date = sdf.parse(rDate.toString());
dateStr=sdf1.format(date).toString(); dateStr=sdf1.format(date).toString();
sepFound = "Y"; // Added by Raj - Req.ID: ADM5000192 - 27/05/08 sepFound = "Y"; // Added by Raj - Req.ID: ADM5000192 - 27/05/08
//Added below by Raj (AD90SUN017)- 08/05/2010
status = rsSep.getString("STATUS");
sepMode = rsSep.getString("SEPARATION_MODE");
reason = rsSep.getString("REASON");
vacNoCreated = rsSep.getString("VAC_NO__CREATED");
confDate = rsSep.getString("CONF_DATE");
empCodeConf = rsSep.getString("EMP_CODE__CONF");
reliveDate = rsSep.getString("RELIEVE_DATE");
//Addition ended by Raj (AD90SUN017)- 08/05/2010
}
rsSep.close();
rsSep = null;
stmtSep.close();
stmtSep = null;
//Added below by Raj (AD90SUN017)- 08/05/2010
if ( confDate != null && confDate.trim().length() > 0 )
{
confDate = genericUtility.getValidDateTimeString(confDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat() );
}
if ( reliveDate != null && reliveDate.trim().length() > 0 )
{
reliveDate = genericUtility.getValidDateTimeString(reliveDate,genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat() );
}
valueXmlString.append("<sep_status>").append(status).append("</sep_status>\r\n");
valueXmlString.append("<separation_mode>").append(sepMode).append("</separation_mode>\r\n");
valueXmlString.append("<reason>").append(reason).append("</reason>\r\n");
valueXmlString.append("<vac_no__created>").append(vacNoCreated).append("</vac_no__created>\r\n");
valueXmlString.append("<conf_date_sep>").append(confDate).append("</conf_date_sep>\r\n");
valueXmlString.append("<emp_code__conf_sep>").append(empCodeConf).append("</emp_code__conf_sep>\r\n");
valueXmlString.append("<relieve_date_sep>").append(reliveDate).append("</relieve_date_sep>\r\n");
sql = "SELECT EMP_FNAME,EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = '"+empCodeConf+"'" ;
System.out.println("Sql For Employee Who Confirmed Separation***["+sql+"]");
stmtSep = connSep.createStatement();
rsSep = stmtSep.executeQuery(sql);
while (rsSep.next())
{
approverfirstName=(rsSep.getString(1)==null?"":rsSep.getString(1));
approverlastName=(rsSep.getString(2)==null?"":rsSep.getString(2));
} }
stmtSep.close(); stmtSep.close();
valueXmlString.append("<emp_fname_sep_conf>").append(approverfirstName).append("</emp_fname_sep_conf>\r\n");
valueXmlString.append("<emp_lname_sep_conf>").append(approverlastName).append("</emp_lname_sep_conf>\r\n");
//Addition ended by Raj (AD90SUN017)- 08/05/2010
System.out.println("EmpCode:::["+currentColumn+"]"); System.out.println("EmpCode:::["+currentColumn+"]");
System.out.println("ResiDate(Database):::["+rDate+"]"); System.out.println("ResiDate(Database):::["+rDate+"]");
System.out.println("APPLICATION DATE FORMAT::["+dateStr+"]"); System.out.println("APPLICATION DATE FORMAT::["+dateStr+"]");
System.out.println("Seperation Found::["+sepFound+"]"); // Added by Raj - Req.ID: ADM5000192 - 27/05/08 System.out.println("Seperation Found::["+sepFound+"]"); // Added by Raj - Req.ID: ADM5000192 - 27/05/08
java.sql.Date reliveDate = null; //java.sql.Date reliveDate = null; //Remarked by Raj (AD90SUN017)- 12/05/2010
if (sepFound != null && sepFound == "Y") // If condition is Added by Raj - Req.ID: ADM5000192 - 27/05/08 if (sepFound != null && sepFound == "Y") // If condition is Added by Raj - Req.ID: ADM5000192 - 27/05/08
{ {
sql = "SELECT EMP_SITE,RELIEVE_DATE,EMP_FNAME,EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = '"+columnValue.trim()+"'" ; //sql = "SELECT EMP_SITE,RELIEVE_DATE,EMP_FNAME,EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = '"+columnValue.trim()+"'" ; //Remarked and added below by Raj (AD90SUN017)- 12/05/2010
sql = "SELECT EMP_SITE,EMP_FNAME,EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = '"+columnValue.trim()+"'" ; //Added by Raj (AD90SUN017)- 12/05/2010
System.out.println("Sql For Employee***["+sql+"]"); System.out.println("Sql For Employee***["+sql+"]");
stmtSep = connSep.createStatement(); stmtSep = connSep.createStatement();
rsSep = stmtSep.executeQuery(sql); rsSep = stmtSep.executeQuery(sql);
...@@ -476,11 +560,11 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -476,11 +560,11 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
{ {
loginSite = (rsSep.getString(1)==null?"":rsSep.getString(1)); loginSite = (rsSep.getString(1)==null?"":rsSep.getString(1));
reliveDate = rsSep.getDate(2); //reliveDate = rsSep.getDate(2); //Remarked by Raj (AD90SUN017)- 12/05/2010
firstName=(rsSep.getString(3)==null?"":rsSep.getString(3)); firstName=(rsSep.getString(2)==null?"":rsSep.getString(2));
lastName=(rsSep.getString(4)==null?"":rsSep.getString(4)); lastName=(rsSep.getString(3)==null?"":rsSep.getString(3));
date = sdf.parse(reliveDate.toString()); //date = sdf.parse(reliveDate.toString()); //Remarked by Raj (AD90SUN017)- 12/05/2010
reliveDateStr=sdf1.format(date).toString(); //reliveDateStr=sdf1.format(date).toString(); //Remarked by Raj (AD90SUN017)- 12/05/2010
} }
System.out.println("Employee Site code:::["+loginSite+"]"); System.out.println("Employee Site code:::["+loginSite+"]");
...@@ -489,7 +573,7 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -489,7 +573,7 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
System.out.println("Employee Last Name :::["+lastName+"]"); System.out.println("Employee Last Name :::["+lastName+"]");
stmtSep.close(); stmtSep.close();
System.out.println("ReliveDateStr in Appl Format:::["+reliveDateStr+"]"); //System.out.println("ReliveDateStr in Appl Format:::["+reliveDateStr+"]"); //Remarked by Raj (AD90SUN017)- 12/05/2010
sql = "SELECT DESCR FROM SITE WHERE SITE_CODE ='" +loginSite+ "'"; sql = "SELECT DESCR FROM SITE WHERE SITE_CODE ='" +loginSite+ "'";
System.out.println("Sql for site descr "+sql); System.out.println("Sql for site descr "+sql);
...@@ -515,14 +599,12 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -515,14 +599,12 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
valueXmlString.append("<emp_lname>").append(lastName).append("</emp_lname>\r\n"); valueXmlString.append("<emp_lname>").append(lastName).append("</emp_lname>\r\n");
valueXmlString.append("<resi_date>").append(dateStr).append("</resi_date>\r\n"); valueXmlString.append("<resi_date>").append(dateStr).append("</resi_date>\r\n");
valueXmlString.append("<site_code>").append(loginSite).append("</site_code>\r\n"); valueXmlString.append("<site_code>").append(loginSite).append("</site_code>\r\n");
valueXmlString.append("<relieve_date>").append(reliveDateStr).append("</relieve_date>\r\n"); //valueXmlString.append("<relieve_date>").append(reliveDateStr).append("</relieve_date>\r\n"); //Remarked by Raj (AD90SUN017)- 11/05/2010
valueXmlString.append("<site_descr>").append(siteDescr).append("</site_descr>\r\n"); valueXmlString.append("<site_descr>").append(siteDescr).append("</site_descr>\r\n");
//End - Added by jaimin on 17/07/2008 (AD89SUN025) //End - Added by jaimin on 17/07/2008 (AD89SUN025)
valueXmlString.append("</Detail1>\r\n"); valueXmlString.append("</Detail1>\r\n");
} }
break; break;
...@@ -539,6 +621,31 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo ...@@ -539,6 +621,31 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
System.out.println("Exception ::"+e.getMessage()); System.out.println("Exception ::"+e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
//Added below by Raj (AD90SUN017)- 12/05/2010
finally
{
try
{
if (rsSep != null)
{
rsSep.close();
rsSep = null;
}
if (stmtSep != null)
{
stmtSep.close();
stmtSep = null;
}
if (connSep != null)
{
connSep.close();
connSep = null;
}
}
catch(Exception e) {}
}
//Addition ended by Raj (AD90SUN017)- 12/05/2010
return valueXmlString.toString(); return valueXmlString.toString();
}//END OF ITEMCHNGE }//END OF ITEMCHNGE
} }
\ No newline at end of file
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