Some minor changes related to Empwise pay structure

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

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

@@ -591,19 +591,20 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 							if("NULLFOUND".equalsIgnoreCase(mval) || ("N".equalsIgnoreCase(mval)))
 							{
 								confirmed = checkNull(genericUtility.getColumnValue("confirmed", dom));
-							}
-
-							if(confirmed == null || !("Y".equalsIgnoreCase(confirmed)))
-							{
-								errCode = "VTPAYSTR02"; 
-								errList.add(errCode);
-								errFields.add(childNodeName.toLowerCase());	
-								msgType = errorType(conn, errCode);
-								if (msgType.equalsIgnoreCase("E")) 
+								
+								if(confirmed == null || !("Y".equalsIgnoreCase(confirmed)))
 								{
-									break;
+									errCode = "VTPAYSTR02"; 
+									errList.add(errCode);
+									errFields.add(childNodeName.toLowerCase());	
+									msgType = errorType(conn, errCode);
+									if (msgType.equalsIgnoreCase("E")) 
+									{
+										break;
+									}
 								}
 							}
+
 						}
 
 						//--------------Validation for Confirmed  Ends here--------------------------
@@ -769,6 +770,7 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 		String refType="",refNo="", login_emp_code="";
 		String confirmed="";
 		Timestamp joinDate = null, effDate = null;
+		String empName = "";
 		String adCode = "", descr ="" ,ls_empad_aprv= "",prop_yn="";
 		String sql = "";
 		int currentFormNo=0,ctr=0;
@@ -837,14 +839,18 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 						System.out.println("effDateStr :::::"+ effDateStr +" effDate :::::"+ effDate);
 						cnt = 0;
 
-						sql = "select date_join from employee where emp_code= ?";
+						//----Modified by Jaffar S on 13th June 19
+						//sql = "select date_join from employee where emp_code= ?";
+						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");
-							System.out.println("joinDate:::::"+ joinDate);
+							empName = rs.getString("emp_name");
+							System.out.println("joinDate:::::"+ joinDate + " empName::::: "+empName);
 						}
 						if(rs != null)
 						{
@@ -856,7 +862,10 @@ public class EmployeeAdIC extends ValidatorEJB implements EmployeeAdICLocal,Empl
 							pstmt.close(); 
 							pstmt = null;
 						}
-
+						
+						//Added by Jaffar for getting employee name
+						valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
+						
 						if(joinDate != null)
 						{
 							sql = "select count(*) as count from employee_ad where emp_code = ? and eff_date > ?";