emp_basic_info21.xml

emp_personal_info21.xml
d_emp_basic_info21.srd
d_emp_personal_info21.srd
EmpBasicInfo.java
EmployeeEJB.java
EmpPersonalInfo.java
-Changes done related to retirement_date and retirement_age



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

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

@@ -129,7 +129,9 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 		String loginSite = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode"));
 
 		StringBuffer valueXmlString = new StringBuffer();
-		
+		//Modified by Rohini T on [21/08/19][Start]
+		AdmCommon admCommon = new AdmCommon();
+		//Modified by Rohini T on [21/08/19][End]
 		System.out.println("Login Employee got..:: ["+loginEmpCode+"]");
 		System.out.println("objContext ..:: ["+objContext+"]");
 		System.out.println("currentColumn ..:: ["+currentColumn+"]");
@@ -183,6 +185,39 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 							else if(currentColumn.equalsIgnoreCase("itm_default"))
 							{
 								valueXmlString.append("<revision_no><![CDATA[").append(1).append("]]></revision_no>\r\n");
+								//Modified by Rohini T on [21/08/19][Start]
+								if(loginSite != null && loginSite.length() > 0)
+								{
+									valueXmlString.append("<emp_site><![CDATA[").append(loginSite).append("]]></emp_site>\r\n");
+								}
+								String EmpRetAge = checkNull(admCommon.getAdmEnv(loginSite, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+								if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
+								{
+									EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn));
+							}
+								if(EmpRetAge == null  || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND"))
+								{
+									EmpRetAge = "0";
+								}
+								int maval1 = 0;
+								try
+								{
+									maval1=Integer.parseInt(EmpRetAge);
+								}
+								catch (Exception ei)
+								{
+									maval1 = 0;
+								}
+								if(maval1 <=0 )
+								{
+									maval1=0;
+								}
+								if(maval1 <=100)
+								{
+									maval1=maval1*12;
+								}
+								valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
+								//Modified by Rohini T on [21/08/19][End]
 							}
 							//Modified by Anjali R. on [08/03/2019][End]
 							else if (currentColumn.equalsIgnoreCase("contact_code"))
@@ -261,7 +296,11 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 										valueXmlString.append("<emp_fname><![CDATA[").append(fname).append("]]></emp_fname>\r\n");
 										valueXmlString.append("<emp_mname><![CDATA[").append(mname).append("]]></emp_mname>\r\n");
 										valueXmlString.append("<emp_lname><![CDATA[").append(lname).append("]]></emp_lname>\r\n");
-										
+										//Modified by Rohini T on [21/08/19][Start]
+										valueXmlString.append("<emp_fname_long><![CDATA[").append(fname).append("]]></emp_fname_long>\r\n");
+										valueXmlString.append("<emp_mname_long><![CDATA[").append(mname).append("]]></emp_mname_long>\r\n");
+										valueXmlString.append("<emp_lname_long><![CDATA[").append(lname).append("]]></emp_lname_long>\r\n");
+										//Modified by Rohini T on [21/08/19][End]
 										if(empCode == null || empCode.length() == 0)
 										{
 											valueXmlString.append("<emp_code><![CDATA[").append(contactCode).append("]]></emp_code>\r\n");
@@ -293,12 +332,13 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 								}
 								System.out.println("departmentDescr ..:: ["+departmentDescr+"]");
 								valueXmlString.append("<department_descr><![CDATA[").append(departmentDescr).append("]]></department_descr>\r\n");
-							
+								//Modified by Rohini T on [21/08/19][Start]
+								/*
 								if(loginSite != null && loginSite.length() > 0)
 								{
 									valueXmlString.append("<emp_site><![CDATA[").append(loginSite).append("]]></emp_site>\r\n");
-								}
-								
+								}*/
+								//Modified by Rohini T on [21/08/19][End]
 								//Added by Ahmed on 18/09/2015[To set parent department, function code, function head, business unit and unit head][START][A15FSUN006]
 								departmentDescr = "";
 								sql = "SELECT D.DEPT_CODE__PARENT AS PARENT_DEPT, S.DESCR AS PARENT_DESCR FROM DEPARTMENT D, DEPARTMENT S WHERE D.DEPT_CODE = ?  AND S.DEPT_CODE = D.DEPT_CODE__PARENT";
@@ -674,6 +714,9 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 							else if (currentColumn.equalsIgnoreCase("cadre_code"))
 							{
 								cadreCode = checkNull(genericUtility.getColumnValue("cadre_code",dom,"1")) ;
+								//Modified by Rohini T on [21/08/19][Start]
+								gradeCode = checkNull(genericUtility.getColumnValue("grade_code",dom,"1")) ;
+								//Modified by Rohini T on [21/08/19][End]
 								sql = "SELECT DESCR  FROM CADRE WHERE CADRE_CODE = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,cadreCode);
@@ -694,6 +737,38 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 								}
 									System.out.println("cadreCodeDescr ..:: ["+cadreCodeDescr+"]");
 									valueXmlString.append("<cadre_descr><![CDATA[").append(cadreCodeDescr).append("]]></cadre_descr>\r\n");
+								//Modified by Rohini T on [21/08/19][Start]
+								if("A".equalsIgnoreCase(editFlag)) 
+								{
+									String EmpRetAge = checkNull(admCommon.getAdmEnv(loginSite, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
+									{
+										EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn));
+							}
+									if(EmpRetAge == null  || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND"))
+									{
+										EmpRetAge = "0";
+									}
+									int maval1 = 0;
+									try
+									{
+										maval1=Integer.parseInt(EmpRetAge);
+									}
+									catch (Exception ei)
+									{
+										maval1 = 0;
+									}
+									if(maval1 <=0 )
+									{
+										maval1=0;
+									}
+									if(maval1 <=100)
+									{
+										maval1=maval1*12;
+									}
+									valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
+								}
+								//Modified by Rohini T on [21/08/19][End]
 							}
 							else if (currentColumn.equalsIgnoreCase("grade_code"))
 							{
@@ -745,6 +820,38 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 										System.out.println("cadreCodeDescr ..:: ["+cadreCodeDescr+"]");
 										valueXmlString.append("<cadre_descr><![CDATA[").append(cadreCodeDescr).append("]]></cadre_descr>\r\n");
 									}
+								//Modified by Rohini T on [21/08/19][Start]
+								if("A".equalsIgnoreCase(editFlag)) 
+								{
+									String EmpRetAge = checkNull(admCommon.getAdmEnv(loginSite, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
+									{
+										EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn));
+									}
+									if(EmpRetAge == null  || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND"))
+									{
+										EmpRetAge = "0";
+									}
+									int maval1 = 0;
+									try
+									{
+										maval1=Integer.parseInt(EmpRetAge);
+									}
+									catch (Exception ei)
+									{
+										maval1 = 0;
+									}
+									if(maval1 <=0 )
+									{
+										maval1=0;
+									}
+									if(maval1 <=100)
+									{
+										maval1=maval1*12;
+									}
+									valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
+								}
+								//Modified by Rohini T on [21/08/19][End]
 							}
 							else if (currentColumn.equalsIgnoreCase("report_to"))
 							{

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

@@ -7,6 +7,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -19,6 +20,7 @@ import org.w3c.dom.NodeList;
 import ibase.utility.E12GenericUtility;//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ]
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.ejb.sys.UtilMethods;
 import ibase.webitm.utility.ITMException;
 
 //Modified By Dipesh on[19/07/2019][Start] 
@@ -101,7 +103,8 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 		String stateCode = "";
 		String drivLicValidUpto = "";
 		String handicapCategory = "";
-		String retAge = "";
+		int retAge = 0;
+		//Modified by Rohini T on [21/08/19][End]
 		String retDate = "";
 		Timestamp birthDateDT = null;
 		Timestamp retirementDate = null;
@@ -120,7 +123,19 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 		//GenericUtility genericUtility = GenericUtility.getInstance();
 		E12GenericUtility genericUtility = new E12GenericUtility();
 		//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][End]
-
+		//Modified by Rohini T on [21/08/19][Start]
+		Timestamp today = null;
+		Timestamp currentDate = null;
+		String retirementVarvalue = "";
+		AdmCommon admCommon = new AdmCommon();
+		UtilMethods utilmethod=new UtilMethods();
+		String retDateStr = "";	
+		String siteCode = "";
+		String cadreCode = "";
+		String gradeCode = "";
+		String retirementAge = "";
+		String birthDate = "";
+		//Modified by Rohini T on [21/08/19][End]
 		StringBuffer valueXmlString = new StringBuffer();
 
 		System.out.println("objContext ..:: ["+objContext+"]");
@@ -141,7 +156,9 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 			conn=getConnection();
 			//Added by Dipesh on[19/07/2019][End]
 			conn.setAutoCommit(false);
-
+			//Modified by Rohini T on [21/08/19][Start]
+			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			//Modified by Rohini T on [21/08/19][End]
 			valueXmlString = new StringBuffer("<?xml version=\"1.0\"?><Root><header><editFlag>");
 			valueXmlString.append(editFlag).append("</editFlag></header>");
 
@@ -519,18 +536,21 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 				//Modified by Azhar K. [To recalculate retirement age and date on change of birth date][Start]
 				else if (currentColumn.equalsIgnoreCase("birth_date"))
 				{
-					int retirementAge = 0;
+					//int retirementAge = 0;
 
 					//Added by Dipesh on[19/07/2019][Start]
 					//retAge = checkNull(genericUtility.getColumnValue("retirement_age",dom));
 					//String birthDate = checkNull(genericUtility.getColumnValue("birth_date",dom));
 					//retDate = checkNull(genericUtility.getColumnValue("retirement_date",dom));
-					retAge = checkNull(genericUtility.getColumnValue("retirement_age",dom));
-					String birthDate = checkNull(genericUtility.getColumnValue("birth_date",dom));
-					retDate = checkNull(genericUtility.getColumnValue("retirement_date",dom));
+					//Modified by Rohini T on [21/08/19][Start]
+				//	retAge = checkNull(genericUtility.getColumnValue("retirement_age",dom));
+					empCode = checkNull(genericUtility.getColumnValue("emp_code",dom));
+					birthDate = checkNull(genericUtility.getColumnValue("birth_date",dom));
+				//	retDate = checkNull(genericUtility.getColumnValue("retirement_date",dom));
 					//Added by Dipesh on[19/07/2019][End]
-
-					birthDateDT = Timestamp.valueOf(genericUtility.getValidDateString(birthDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+					//birthDateDT = Timestamp.valueOf(genericUtility.getValidDateString(birthDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+					birthDateDT = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(birthDate, genericUtility.getApplDateFormat() , genericUtility.getDBDateFormat()));
+					/*
 					try
 					{
 						retirementAge = Integer.parseInt(retAge);
@@ -552,9 +572,87 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 					if(retirementDate != null)
 					{
 						retDate = genericUtility.getValidDateString(retirementDate.toString(), genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
+					}*/
+					sql = "SELECT PAY_SITE, CADRE, GRADE,RETIREMENT_AGE FROM EMPLOYEE WHERE EMP_CODE = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,empCode);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						siteCode = checkNull(rs.getString("PAY_SITE"));
+						cadreCode = checkNull(rs.getString("CADRE"));
+						gradeCode = checkNull(rs.getString("GRADE"));
+						retirementAge = rs.getString("RETIREMENT_AGE");
+						
+					}
+					if(rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					try
+					{
+						retAge = Integer.parseInt(retirementAge);
+					}
+					catch(Exception e)
+					{
+						retAge = 0;
+					}
+					if(retirementAge != null && retAge != 0) 
+					{
+						today = new java.sql.Timestamp(System.currentTimeMillis()) ;
+						SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
+						currentDate = java.sql.Timestamp.valueOf(sdf1.format(today) + " 00:00:00.000");
+						retirementVarvalue=checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "RETIREMENT_CALC_DBF",currentDate, conn));
+						if("NULLFOUND".equalsIgnoreCase(retirementVarvalue))	
+						{
+							retirementVarvalue = admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn);
+							if("NULLFOUND".equalsIgnoreCase(retirementVarvalue) ||  retirementVarvalue == null || retirementVarvalue.trim().length() == 0)
+							{
+								retirementVarvalue="";
+							}
+							else if(utilmethod.left(retirementVarvalue, 4).equalsIgnoreCase("ERR"))	
+							{
+								retirementVarvalue="";
+							}
+						}
+						if(retirementVarvalue != null && retirementVarvalue.trim().length() > 0)
+						{
+							sql = "SELECT "+retirementVarvalue+"(?,?,?)as retDate FROM DUAL";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1,empCode);
+							pstmt.setInt(2,retAge);
+							pstmt.setTimestamp(3,birthDateDT);
+							rs = pstmt.executeQuery();
+							if(rs.next())
+							{
+								retirementDate = rs.getTimestamp("retDate");
+							}
+							if (rs != null) 
+							{
+								rs.close();
+								rs = null;
+							}
+							if (pstmt != null)
+							{
+								pstmt.close();
+								pstmt = null;
+							}	
+						}
+						if(retirementDate == null)
+						{
+							retirementDate=utilmethod.AddMonths(birthDateDT, retAge);
+						}
+						retDateStr = sdf.format(new Date(retirementDate.getTime()));
+						//valueXmlString.append("<retirement_age>").append("<![CDATA[" + retireAge + "]]>").append("</retirement_age>");
+						valueXmlString.append("<retirement_date>").append("<![CDATA[" + retDateStr + "]]>").append("</retirement_date>");
 					}
-					valueXmlString.append("<retirement_age>").append("<![CDATA[" + retireAge + "]]>").append("</retirement_age>");
-					valueXmlString.append("<retirement_date>").append("<![CDATA[" + retDate + "]]>").append("</retirement_date>");
+					//Modified by Rohini T on [21/08/19][End]
 				}
 				//Modified by Azhar K. [To recalculate retirement age and date on change of birth date][End]
 			}//End of Case 1

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

@@ -3419,8 +3419,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 						//valueXmlString.append("<nationality>").append("<![CDATA[IND]]>").append("</nationality>");
 					}
 					valueXmlString.append("<m_status>").append("<![CDATA[U]]>").append("</m_status>");
-
-					String EmpRetAge=admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", connection);
+					//Modified by Rohini T on [21/08/19][Start] 
+					String EmpRetAge = checkNull(admCommon.getAdmEnv(loginSite, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), connection));
+					if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
+					{
+						EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", connection));
+					}
+					//String EmpRetAge=admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", connection);
+					//Modified by Rohini T on [21/08/19][End] 
 					if(EmpRetAge == null  || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND"))
 					{
 						EmpRetAge = "0";
@@ -4313,6 +4319,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 						valueXmlString.append("<grade_descr>").append("<![CDATA[]]>").append("</grade_descr>");
 					}
 					close(pstmt, rs);
+					//Modified by Rohini T on 21/08/19[Start]
+					if("A".equalsIgnoreCase(editFlag))
+					{
+						String retDateStr = gbSetRetirementDate(dom, connection);
+						String protect= gbfGetRetdateProtectFlag(dom);
+						valueXmlString.append("<retirement_date  protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
+					}
+					//Modified by Rohini T on 21/08/19[End]
 
 				}
 
@@ -4336,6 +4350,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 						valueXmlString.append("<cadre_descr>").append("<![CDATA[]]>").append("</cadre_descr>");
 					}
 					close(pstmt, rs);
+					//Modified by Rohini T on 21/08/19[Start]
+					if("A".equalsIgnoreCase(editFlag))
+					{
+						String retDateStr = gbSetRetirementDate(dom, connection);
+						String protect= gbfGetRetdateProtectFlag(dom);
+						valueXmlString.append("<retirement_date  protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
+				}
+					//Modified by Rohini T on 21/08/19[End]
 				}
 
 
@@ -4361,6 +4383,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 					{
 						valueXmlString.append("<work_site>").append("<![CDATA[" + empSite + "]]>").append("</work_site>");
 					}
+					//Modified by Rohini T on 21/08/19[Start]
+					if("A".equalsIgnoreCase(editFlag))
+					{
+						String retDateStr = gbSetRetirementDate(dom, connection);
+						String protect= gbfGetRetdateProtectFlag(dom);
+						valueXmlString.append("<retirement_date  protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
+					}
+					//Modified by Rohini T on 21/08/19[End]
 				}
 
 
@@ -6725,8 +6755,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 			//Modified by Poonam B on 12/07/2019[END].To add checkNull method
 			if(BirthDate != null && BirthDate.trim().length() > 0)
 			{
+				//Modified by Rohini T on [21/08/19][Start]
+				/*
 				birthDate=Timestamp.valueOf(genericUtility.getValidDateTimeString
-						(BirthDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())+"00:00:00.0");
+						(BirthDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())+"00:00:00.0");*/
+				birthDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(BirthDate, genericUtility.getApplDateFormat() , genericUtility.getDBDateFormat()));
+				//Modified by Rohini T on [21/08/19][End]
 			}
 
 			if(retAge <= 0 || birthDate == null)
@@ -6743,8 +6777,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 			if("NULLFOUND".equalsIgnoreCase(retirementVarvalue))	
 			{
 				retirementVarvalue = admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn);
-
-				if(retirementVarvalue.equalsIgnoreCase("NULLFOUND") ||  retirementVarvalue == null || retirementVarvalue.trim().length() == 0)
+				//Modified by Rohini T on [21/08/19][Start]
+				//if(retirementVarvalue.equalsIgnoreCase("NULLFOUND") ||  retirementVarvalue == null || retirementVarvalue.trim().length() == 0)
+				if("NULLFOUND".equalsIgnoreCase(retirementVarvalue) ||  retirementVarvalue == null || retirementVarvalue.trim().length() == 0)
+				//Modified by Rohini T on [21/08/19][End]
 				{
 					retirementVarvalue="";
 				}