Sana S : Modified on05/03/20

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217562 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/src/ibase/webitm/ejb/adm/HolChangeIC.java

@@ -8,8 +8,7 @@ import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-
-//import javax.ejb.Stateless;
+import javax.ejb.Stateless;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -20,7 +19,7 @@ import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 
-//@Stateless
+@Stateless
 
 //Created by Sana Shaikh on 19/08/2019  for holiday Change of employee  [START]
 public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolChangeICLocal
@@ -82,17 +81,19 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
 		String holDateTo="";
 		String empFname="";
 		String empLname="";
-		String status="",work_site="";
+		String status="",workSite="";
 		String holDateFor="";
 		String hol="";
 		String dayFrom="",dayTo="",dayFromDt="",dayToDt="";
 		Timestamp dateFor = null,dateTo = null,dayFrom1=null,dayTo1=null;
 		SimpleDateFormat sdf = new SimpleDateFormat("EEEE");
-		SimpleDateFormat sdf1 = new SimpleDateFormat("dd/MM/yy");//added by Sana S on 03/12/19
+		//SimpleDateFormat sdf1 = new SimpleDateFormat("dd/MM/yy");//added by Sana S on 03/12/19
+		
 		E12GenericUtility genericUtility = new E12GenericUtility();
 
 		try 
 		{
+			SimpleDateFormat sdf1 = new SimpleDateFormat( genericUtility.getApplDateFormat() );//added by Sana S on 05/03/20
 			System.out.println("currentFormNo...." + currentFormNo);
 			connectionObject = getConnection();
 
@@ -222,7 +223,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
 					{
 						empFname = checkNull(resultSet.getString("fname"));
 						empLname = checkNull(resultSet.getString("lname"));
-						work_site = checkNull(resultSet.getString("work_site"));
+						workSite = checkNull(resultSet.getString("work_site"));
 					}
 					if (resultSet != null) 
 					{
@@ -237,7 +238,7 @@ public class HolChangeIC extends ValidatorEJB implements HolChangeICRemote, HolC
 
 					valueXmlString.append("<emp_fname protect=\"1\"><![CDATA[").append(empFname).append("]]></emp_fname>");
 					valueXmlString.append("<emp_lname protect=\"1\"><![CDATA[").append(empLname).append("]]></emp_lname>");
-					valueXmlString.append("<work_site><![CDATA[").append(work_site).append("]]></work_site>");
+					valueXmlString.append("<work_site><![CDATA[").append(workSite).append("]]></work_site>");
 				}
 
 				else if (currentColumn.trim().equals("hol_date_for"))