EmployeeAdIC.java

*Changes commited on behalf of piyush sir


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

webitm-adm/ibase/webitm/ejb/adm/EmployeeAdIC.java

@@ -832,6 +832,32 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 					valueXmlString.append("<exp_date>").append("<![CDATA["+expDate+"]]>").append("</exp_date>");
 					effDateStr = this.genericUtility.getValueFromXTRA_PARAMS(xtraParams, "eff_date");
 
+					// Modified by Piysuh on 25/07/2019 [Shifted outside from bellow if condition to set employee name].Start
+					sql = "select date_join, FN_GET_EMP_NAME(?,'FL1') as emp_name from employee where emp_code= ?";
+					pstmt= conn.prepareStatement(sql);
+					pstmt.setString(1,empCode);
+					pstmt.setString(2,empCode);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						joinDate = rs.getTimestamp("date_join");
+						empName = rs.getString("emp_name");
+						System.out.println("joinDate:::::"+ joinDate + " empName::::: "+empName);
+					}
+					if(rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pstmt != null)
+					{
+						pstmt.close(); 
+						pstmt = null;
+					}
+					valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
+
+					// Modified by Piysuh on 25/07/2019 [Shifted outside from bellow if condition to set employee name].End
+
 					if((effDateStr == null || effDateStr.trim().length() == 0) && "E".equalsIgnoreCase(entryMode))
 					{
 						effDateStr = todayDate;
@@ -841,6 +867,8 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 
 						//----Modified by Jaffar S on 13th June 19
 						//sql = "select date_join from employee where emp_code= ?";
+						// Modified by Piysuh on 25/07/2019 [Shifted outside of if condition to set employee name].Start
+						/*
 						sql = "select date_join, FN_GET_EMP_NAME(?,'FL1') as emp_name from employee where emp_code= ?";
 						pstmt= conn.prepareStatement(sql);
 						pstmt.setString(1,empCode);
@@ -865,6 +893,8 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 						
 						//Added by Jaffar for getting employee name
 						valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
+						*/
+						// Modified by Piysuh on 25/07/2019 [Shifted outside of if condition to set employee name].End
 						
 						if(joinDate != null)
 						{
@@ -1216,4 +1246,4 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 
 
 
-}
+}
\ No newline at end of file