Commit 1618d52d authored by ssalve's avatar ssalve

Sarita : Done changes to set long_name of employee on 27 SEP 2018

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@191278 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9838d626
......@@ -611,7 +611,10 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
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+"'" ;
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [START]
//sql = "SELECT EMP_FNAME,EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = '"+empCodeConf+"'" ;
sql = "SELECT EMP_FNAME_LONG,EMP_LNAME_LONG FROM EMPLOYEE WHERE EMP_CODE = '"+empCodeConf+"'" ;
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [END]
System.out.println("Sql For Employee Who Confirmed Separation***["+sql+"]");
stmtSep = connSep.createStatement();
rsSep = stmtSep.executeQuery(sql);
......@@ -624,8 +627,12 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
approverlastName=checkNull(rsSep.getString(2));
}
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");
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [START]
/*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");*/
valueXmlString.append("<emp_fname_long_sep_conf>").append(approverfirstName).append("</emp_fname_long_sep_conf>\r\n");
valueXmlString.append("<emp_lname_long_sep_conf>").append(approverlastName).append("</emp_lname_long_sep_conf>\r\n");
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [END]
//Addition ended by Raj (AD90SUN017)- 08/05/2010
System.out.println("EmpCode:::["+currentColumn+"]");
......@@ -637,13 +644,15 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
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()+"'" ; //Remarked and added below by Raj (AD90SUN017)- 13/05/2010
sql = "SELECT EMP_SITE,EMP_FNAME,EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = '"+columnValue.trim()+"'" ; //Added by Raj (AD90SUN017)- 13/05/2010
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [START]
//sql = "SELECT EMP_SITE,EMP_FNAME,EMP_LNAME FROM EMPLOYEE WHERE EMP_CODE = '"+columnValue.trim()+"'" ; //Added by Raj (AD90SUN017)- 13/05/2010
sql = "SELECT EMP_SITE,EMP_FNAME_LONG,EMP_LNAME_LONG FROM EMPLOYEE WHERE EMP_CODE = '"+columnValue.trim()+"'" ;
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [END]
System.out.println("Sql For Employee***["+sql+"]");
stmtSep = connSep.createStatement();
rsSep = stmtSep.executeQuery(sql);
while (rsSep.next())
{
{
loginSite = (rsSep.getString(1)==null?"":rsSep.getString(1));
//reliveDate = rsSep.getDate(2); //Remarked by Raj (AD90SUN017)- 13/05/2010
firstName=(rsSep.getString(2)==null?"":rsSep.getString(2));
......@@ -680,8 +689,12 @@ public class SepClose extends ValidatorEJB implements SepCloseLocal,SepCloseRemo
*/ //End - commented by jaimin on 17/07/2008 (AD89SUN025)
}
//Start - Added by jaimin on 17/07/2008 (AD89SUN025)
valueXmlString.append("<emp_fname>").append(firstName).append("</emp_fname>\r\n");
valueXmlString.append("<emp_lname>").append(lastName).append("</emp_lname>\r\n");
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [START]
/*valueXmlString.append("<emp_fname>").append(firstName).append("</emp_fname>\r\n");
valueXmlString.append("<emp_lname>").append(lastName).append("</emp_lname>\r\n");*/
valueXmlString.append("<emp_fname_long>").append(firstName).append("</emp_fname_long>\r\n");
valueXmlString.append("<emp_lname_long>").append(lastName).append("</emp_lname_long>\r\n");
//Commented and Added by sarita to get emp_fname_long and emp_lname_long instead emp_fname and emp_lname on 21 SEP 2018 [END]
//valueXmlString.append("<resi_date>").append(dateStr).append("</resi_date>\r\n");Remarked by Pawan on 09/10/10 [AD01SUN009]
valueXmlString.append("<resi_date>").append(resiDate).append("</resi_date>\r\n"); //Remarked by Pawan 09/10/10 [AD01SUN009]
valueXmlString.append("<site_code>").append(loginSite).append("</site_code>\r\n");
......
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