EmpBasicInfo.java

EmployeeEJB.java
EmpPersonalInfo.java
-Changes done related to retirement date and retirement age of employee.


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

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

@@ -132,6 +132,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 		//Modified by Rohini T on [21/08/19][Start]
 		AdmCommon admCommon = new AdmCommon();
 		//Modified by Rohini T on [21/08/19][End]
+		String SiteCode = "";//Added by Rohini T on 28/08/19
 		System.out.println("Login Employee got..:: ["+loginEmpCode+"]");
 		System.out.println("objContext ..:: ["+objContext+"]");
 		System.out.println("currentColumn ..:: ["+currentColumn+"]");
@@ -717,6 +718,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 								//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]
+								SiteCode = checkNull(genericUtility.getColumnValue("emp_site",dom,"1")) ;////Modified by Rohini T on [28/08/19]
 								sql = "SELECT DESCR  FROM CADRE WHERE CADRE_CODE = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,cadreCode);
@@ -740,7 +742,10 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 								//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));
+									//Modified by Rohini T on [28/08/19][Start]
+									//String EmpRetAge = checkNull(admCommon.getAdmEnv(loginSite, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									String EmpRetAge = checkNull(admCommon.getAdmEnv(SiteCode, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									//Modified by Rohini T on [28/08/19][End]
 									if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
 									{
 										EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn));
@@ -774,6 +779,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 							{
 								gradeCode = checkNull(genericUtility.getColumnValue("grade_code",dom,"1")) ;
 								cadreCode = checkNull(genericUtility.getColumnValue("cadre_code",dom,"1")) ;
+								SiteCode = checkNull(genericUtility.getColumnValue("emp_site",dom,"1")) ;////Modified by Rohini T on [28/08/19]
 								sql = "SELECT CADRE_CODE, DESCR FROM GRADE WHERE GRADE_CODE = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,gradeCode);
@@ -823,7 +829,10 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 								//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));
+									//Modified by Rohini T on [28/08/19][Start]
+									//String EmpRetAge = checkNull(admCommon.getAdmEnv(loginSite, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									String EmpRetAge = checkNull(admCommon.getAdmEnv(SiteCode, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									//Modified by Rohini T on [28/08/19][End]
 									if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
 									{
 										EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn));

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

@@ -103,6 +103,7 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 		String stateCode = "";
 		String drivLicValidUpto = "";
 		String handicapCategory = "";
+		//Modified by Rohini T on [21/08/19][Start]
 		int retAge = 0;
 		//Modified by Rohini T on [21/08/19][End]
 		String retDate = "";
@@ -573,13 +574,17 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 					{
 						retDate = genericUtility.getValidDateString(retirementDate.toString(), genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
 					}*/
-					sql = "SELECT PAY_SITE, CADRE, GRADE,RETIREMENT_AGE FROM EMPLOYEE WHERE EMP_CODE = ?";
+					//Modified by Rohini T on [28/08/19][Start]
+					//sql = "SELECT PAY_SITE, CADRE, GRADE,RETIREMENT_AGE FROM EMPLOYEE WHERE EMP_CODE = ?";
+					sql = "SELECT EMP_SITE, CADRE, GRADE,RETIREMENT_AGE FROM EMPLOYEE WHERE EMP_CODE = ?";
+					//Modified by Rohini T on [21/08/19][End]
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,empCode);
 					rs = pstmt.executeQuery();
 					if(rs.next())
 					{
-						siteCode = checkNull(rs.getString("PAY_SITE"));
+						//siteCode = checkNull(rs.getString("PAY_SITE"));//Modified by Rohini T on [28/08/19]
+						siteCode = checkNull(rs.getString("EMP_SITE"));
 						cadreCode = checkNull(rs.getString("CADRE"));
 						gradeCode = checkNull(rs.getString("GRADE"));
 						retirementAge = rs.getString("RETIREMENT_AGE");
@@ -603,7 +608,10 @@ public class EmpPersonalInfo extends ValidatorEJB implements EmpPersonalInfoLoca
 					{
 						retAge = 0;
 					}
-					if(retirementAge != null && retAge != 0) 
+					//Modified by Rohini T on [28/08/19][Start]
+					//	if(retirementAge != null && retAge != 0) 
+					if(String.valueOf(retAge) != null && retAge != 0) 
+					//Modified by Rohini T on [28/08/19][End]
 					{
 						today = new java.sql.Timestamp(System.currentTimeMillis()) ;
 						SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());