EmpBasicInfo.java

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


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

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

@@ -831,7 +831,10 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
 								{
 									//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 [09/09/19][Start]
+									//String EmpRetAge = checkNull(admCommon.getAdmEnv(SiteCode, cadreCode, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									String EmpRetAge = checkNull(admCommon.getAdmEnv(SiteCode, cadreCodeGread, gradeCode, "EMP_RETIREMENT_AGE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
+									//Modified by Rohini T on [09/09/19][End]
 									//Modified by Rohini T on [28/08/19][End]
 									if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
 									{

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

@@ -3432,7 +3432,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 					{
 						EmpRetAge = "0";
 					}
-
 					// Piyush - 29/07/2019.Start
 					// int maval1=Integer.parseInt(EmpRetAge);
 					int maval1 = 0;
@@ -3454,11 +3453,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 					{
 						maval1=maval1*12;
 					}
-
 					valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
-
 					setNodeValue(dom, "retirement_age", "" + maval1); // Piyush - 29/07/2019
-
 					String retDateStr = gbSetRetirementDate(dom, connection);
 					//Modified by Rohini T on [28/08/19][Start] 
 					//String protect= gbfGetRetdateProtectFlag(dom);
@@ -4306,6 +4302,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 						if(gradeCodedoc == null ||gradeCodedoc.trim().length() == 0 || editFlg.equals("A"))
 						{
 							valueXmlString.append("<cadre_code>").append("<![CDATA[" + cadreCode + "]]>").append("</cadre_code>");
+							//Modified by Rohini T on 09/09/19[Start]
+							setNodeValue(dom, "cadre_code", "" + cadreCode);
+							//Modified by Rohini T on 09/09/19[End]
 							sql = " SELECT DESCR FROM CADRE WHERE CADRE_CODE = ? " ;
 							pstmt1 = connection.prepareStatement(sql);
 							pstmt1.setString(1, cadreCode);
@@ -6716,7 +6715,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 				 {
 					 lsVarValue=admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn);
 				 }
-
 				 if(lsVarValue==null || !lsVarValue.toUpperCase().equalsIgnoreCase("Y"))
 					 //if isnull(ls_var_value) or upper(ls_var_value) <> "Y" then 
 				 {
@@ -6747,7 +6745,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 		String retAgeStr="";
 		String empCode="";
 		String retVal="";
-		String retirementVarvalue="";
+		String retirementVarvalue= "";
 		String siteCode="";
 		String gradeCode="";
 		String cadreCode="";
@@ -6805,7 +6803,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 			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))	
 			{
@@ -6822,7 +6819,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 					retirementVarvalue="";
 				}
 			}
-
 			if(retirementVarvalue != null && retirementVarvalue.trim().length() > 0)
 			{
 				sql = "SELECT "+retirementVarvalue+"(?,?,?)as retDate FROM DUAL";