Updated Component StatusChangeIC.java on 16/12/2019

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

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

@@ -1012,7 +1012,7 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
 		String confirmed = "";
 		String probation = "";
 		String noticePrd = "";
-		Timestamp dateJoin = null;
+		
 		String grade = "";
 		String cadre = "";
 		String designCode = "";
@@ -1030,11 +1030,17 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
 		String gradeCode = "";
 		String cadreCode = "";
 		String reasonCode = "";
+		//Added by Shital on 13/12/2019 [Start]
+		Timestamp probationDate = null;
 		String probationDateStr = "";
+		Timestamp dateConf = null;
 		String dateConfStr = "";
+		Timestamp ldJoinDate = null;
 		String ldJoinDateStr = "";
 		StringBuffer valueXmlString = null;
 		SimpleDateFormat sdf = null;
+		//Added by Shital on 13/12/2019 [End]
+		
 		try
 		{
 			conn = getConnection();
@@ -1101,10 +1107,12 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
 						empFname = checkNull(rs.getString("emp_fname"));
 						confirmed = checkNull(rs.getString("confirmed"));
 						probation = checkNull(rs.getString("probation"));
-						probationDateStr = rs.getString("probation_date");
-						dateConfStr = rs.getString("date_conf");
+						//Added by Shital on 13/12/2019 [Start]
+						probationDate = rs.getTimestamp("probation_date");
+						dateConf = rs.getTimestamp("date_conf");
 						lcNoticePrd = checkNull(rs.getString("notice_prd"));
-						ldJoinDateStr = rs.getString("date_join");
+						ldJoinDate = rs.getTimestamp("date_join");
+						//Added by Shital on 13/12/2019 [End]
 						lsGrade = checkNull(rs.getString("grade"));
 						lsCadre = checkNull(rs.getString("cadre"));
 						lsDesignCode = checkNull(rs.getString("design_code"));
@@ -1117,10 +1125,10 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
 					System.out.println("empFname:::"+empFname);
 					System.out.println("confirmed:::"+confirmed);
 					System.out.println("probation:::"+probation);
-					System.out.println("probationDateStr:::"+probationDateStr);
-					System.out.println("dateConfStr:::"+dateConfStr);
+					System.out.println("probationDate:::"+probationDate);
+					System.out.println("dateConf:::"+dateConf);
 					System.out.println("lcNoticePrd:::"+lcNoticePrd);
-					System.out.println("ldJoinDateStr:::"+ldJoinDateStr);
+					System.out.println("ldJoinDate:::"+ldJoinDate);
 					System.out.println("lsGrade:::"+lsGrade);
 					System.out.println("lsCadre:::"+lsCadre);
 					System.out.println("lsDesignCode:::"+lsDesignCode);
@@ -1146,16 +1154,48 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
 					{
 						empLname = lsEmpLnameLong;
 					}
-					System.out.println("probationDateStr:["+probationDateStr+"] \t dateConfStr["+dateConfStr+"] \t ldJoinDateStr["+ldJoinDateStr+"]");
-					if(probationDateStr != null && probationDateStr.trim().length() > 0)
+					System.out.println("probationDate:["+probationDate+"] \t dateConf["+dateConf+"] \t ldJoinDate["+ldJoinDate+"]");
+					
+					//Added by Shital on 13/12/2019 [Start]
+					if(ldJoinDate != null )
 					{
-						probationDateStr = genericUtility.getValidDateString(probationDateStr,"yyyy-MM-dd", genericUtility.getApplDateFormat());
+						ldJoinDateStr = sdf.format(ldJoinDate);
+						System.out.println("ldJoinDateStr:::"+ldJoinDateStr);
+					}
+					else
+					{
+						ldJoinDateStr = "";
+					}
+					
+					if(probationDate != null )
+					{
+						probationDateStr = sdf.format(probationDate);
+						System.out.println("probationDateStr:::"+probationDateStr);
 					}
 					else
 					{
 						probationDateStr = "";
 					}
-					if(dateConfStr != null && dateConfStr.trim().length() > 0)
+					
+					if(dateConf != null )
+					{
+						dateConfStr = sdf.format(dateConf);
+						System.out.println("dateConfStr:::"+dateConfStr);
+					}
+					else
+					{
+						dateConfStr = "";
+					}
+					
+					/*if(probationDateStr != null && probationDateStr.trim().length() > 0)
+					{
+						probationDateStr = genericUtility.getValidDateString(probationDateStr,"yyyy-MM-dd", genericUtility.getApplDateFormat());
+					}
+					else
+					{
+						probationDateStr = "";
+					}*/
+					/*if(dateConfStr != null && dateConfStr.trim().length() > 0)
 					{
 						//dateConfStr = sdf.format(dateConfStr);
 						dateConfStr = genericUtility.getValidDateString(dateConfStr,"yyyy-MM-dd", genericUtility.getApplDateFormat());
@@ -1165,19 +1205,23 @@ public class StatusChangeIC extends ValidatorEJB //implements StatusChangeLocal,
 					else 
 					{
 						dateConfStr  = "";
-					}
-					if(ldJoinDateStr != null && ldJoinDateStr.trim().length() > 0)
+					}*/
+					
+					/*if(ldJoinDateStr != null && ldJoinDateStr.trim().length() > 0)
 					{
+						ldJoinDate =  (Timestamp) sdf.parse(ldJoinDateStr);
+						System.out.println("ldJoinDateStr::::::"+ldJoinDate);
 						//ldJoinDateStr = sdf.format(ldJoinDateStr);
-						ldJoinDateStr = genericUtility.getValidDateString(ldJoinDateStr,"yyyy-MM-dd", genericUtility.getApplDateFormat());
+						//ldJoinDateStr = genericUtility.getValidDateString(ldJoinDateStr,"yyyy-MM-dd", genericUtility.getApplDateFormat());
 
 						//Timestamp.valueOf(genericUtility.getValidDateString(ldJoinDateStr, genericUtility.getDBDateFormat() , genericUtility.getApplDateFormat()) + " 00:00:00.0");
 					}
 					else
 					{
 						ldJoinDateStr = "";
-					}
+					}*/
 					valueXmlString.append("<employee_date_join>").append("<![CDATA[" + ldJoinDateStr + "]]>").append("</employee_date_join>");
+					//Added by Shital on 13/12/2019 [End]
 					valueXmlString.append("<emp_lname>").append("<![CDATA[" + empLname + "]]>").append("</emp_lname>");
 					valueXmlString.append("<emp_fname>").append("<![CDATA[" + empFname + "]]>").append("</emp_fname>");
 					valueXmlString.append("<notice_prd>").append("<![CDATA[" + lcNoticePrd + "]]>").append("</notice_prd>");