-Changes made in site_env parameter

EmpComplete.java
EmployeeEJB.java
EmpWorkInfo.java
A18KSUN005.SQL


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

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

@@ -21,6 +21,8 @@ import ibase.webitm.ejb.sys.UtilMethods;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
+
 @Stateless  
 public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCompleteRemote
 {
@@ -529,24 +531,24 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 						}
 					}
 
-//							mVal = dw_edit.getitemstring(1,"cctr_code__sal")
-//								ls_temp = gf_getenv('999999',"CCTR_YESNO")
-//								if ls_temp = 'NULLFOUND' then
-//								  errcode =  'VSENVAR1'
-//							 else
-//									if Len(trim(mval)) > 0 THEN
-//										Select count(*) into :cnt from costctr where cctr_code = :mval;
-//										IF cnt = 0 THEN
-//										errcode = "VMCCTR1" //Invalid cost cemter code, not defined in master"
-//										END IF
-//									else	 
-//										if ls_temp = 'N' then
-//										errcode = "VMCCTR1" //Invalid cost cemter code, not defined in master"
-//										end if
-//									end if	
-//								END IF
+					//							mVal = dw_edit.getitemstring(1,"cctr_code__sal")
+					//								ls_temp = gf_getenv('999999',"CCTR_YESNO")
+					//								if ls_temp = 'NULLFOUND' then
+					//								  errcode =  'VSENVAR1'
+					//							 else
+					//									if Len(trim(mval)) > 0 THEN
+					//										Select count(*) into :cnt from costctr where cctr_code = :mval;
+					//										IF cnt = 0 THEN
+					//										errcode = "VMCCTR1" //Invalid cost cemter code, not defined in master"
+					//										END IF
+					//									else	 
+					//										if ls_temp = 'N' then
+					//										errcode = "VMCCTR1" //Invalid cost cemter code, not defined in master"
+					//										end if
+					//									end if	
+					//								END IF
 
-//						}
+					//						}
 					if(childNodeName.equalsIgnoreCase("report_to"))
 					{
 						System.out.println(" Validaion   for field "+childNodeName);
@@ -1060,7 +1062,7 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 					pstmt.close();
 					pstmt = null;
 				}
-				if (conn != null)
+				if(conn!=null)
 				{
 					conn.close();
 					conn = null;
@@ -1076,7 +1078,6 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 					e1.printStackTrace();
 				}
 			}			
-					
 			System.out.println(" EmpComplete Validation End and Connection is Closed");
 		}
 		errString = errStringXml.toString();
@@ -1642,7 +1643,10 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 					}
 					varVal = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn));
 					Timestamp todayDt = new Timestamp(System.currentTimeMillis());
-								retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","RETIREMENT_DATE",todayDt,conn));
+					//retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","RETIREMENT_DATE",todayDt,conn));
+					//Modified by Rohini T on [19/04/19][start]
+					retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,conn));
+					//Modified by Rohini T on [19/04/19][end]
 					if(varVal == null || varVal.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varVal)) 
 					{
 						System.out.println("Inside null");
@@ -1994,7 +1998,7 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 					pstmt.close();
 					pstmt = null;
 				}
-				if (conn != null)
+				if(conn != null)
 				{
 					conn.close();
 					conn = null;
@@ -2009,6 +2013,7 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 				} catch (ITMException e1) {
 					e1.printStackTrace();
 				}
+
 			}
 		}
 		System.out.println("[EmpComplete] Connection is Closed");

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

@@ -183,7 +183,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
 						catch (Exception e) {
 							revisionNo = 0;
 						}
-									revisionNo = revisionNo+1;
+						revisionNo = revisionNo + 1;
 						//Modified by Rohini T on 13/March/2019[Req ID: A17DSUN006][END]
 						valueXmlString.append("<revision_no><![CDATA[").append(revisionNo).append("]]></revision_no>\r\n");
 					}
@@ -648,7 +648,11 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
 					varValue = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn));
 					System.out.println("RetDateString---["+varValue+"]");
 					Timestamp todayDt = new Timestamp(System.currentTimeMillis());
-					retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","RETIREMENT_DATE",todayDt,conn));
+					//retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","RETIREMENT_DATE",todayDt,conn));
+					//Modified by Rohini T on [19/04/19][start]
+					retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,conn));
+					//Modified by Rohini T on [19/04/19][end]
+					
 					if(varValue == null || varValue.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varValue)) 
 					{
 						System.out.println("Inside null");
@@ -870,7 +874,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
 		return (errString); 
 	}
 
-/*
+	/*
 	public String wfValData( Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams ) throws RemoteException,ITMException
 	{
 		System.out.println("Came Inside 2 wfValData:::");
@@ -909,7 +913,7 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
 		}
 		return errString;
 	}
-*/
+	 */
 	//30/10/2014
 	//public String wfValData(Document dom, Document dom1,Document dom2, String objContext, String editFlag, String xtraParams,Connection conn) throws RemoteException,ITMException
 	public String wfValData(Document dom, Document dom1,Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException

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

@@ -7,6 +7,12 @@
 
 package ibase.webitm.ejb.adm;
 
+import ibase.system.config.*;
+import ibase.utility.E12GenericUtility;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.GenericUtility;
+import ibase.webitm.utility.ITMException;
+
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -4283,7 +4289,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
 					varVal = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", connection));
 					System.out.println("retDateString---["+varVal+"]");
 					Timestamp todayDt = new Timestamp(System.currentTimeMillis());
-					retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","RETIREMENT_DATE",todayDt,connection));
+					//retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","RETIREMENT_DATE",todayDt,connection));
+					//Modified by Rohini T on [19/04/19][start]
+					retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,connection));
+					//Modified by Rohini T on [19/04/19][end]
 					if(varVal == null || varVal.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varVal)) 
 					{
 						System.out.println("Inside null");

webitm-adm/module-resource/SQL/A18KSUN005.SQL

@@ -15,6 +15,14 @@ values ('99999','ADM','X','ZZZZZ','RETIREMENT_DATE','RETIREMENT_DATE','01-JAN-20
 Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('emp_complete','1','retirement_age',null);
 Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('emp_work_info','1','retirement_age',null);
 Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('emp_master','1','retirement_age',null);
-Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('emp_work_info','1','retirement_age',null);
+Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('emp_temp','1','retirement_age',null);
+
+
+delete from site_env WHERE PAR_NAME='RETIREMENT_DATE';
+
+Insert into SITE_ENV (SITE_CODE,MODULE_CODE,LEVEL_TYPE,LEVEL_CODE,PAR_NAME,DESCR,EFF_DATE,UPTO_DATE,PAR_VALUE,CHG_DATE,CHG_USER,CHG_TERM,DDF_LVDESC) 
+values ('99999','ADM','X','ZZZZZ','PROTECT_RETIRE_DATE','RETIREMENT_DATE','01-JAN-2019','01-DEC-2040','Y',SYSDATE,'BASE      ','BASE           ',null);
+
+commit;
 
 commit;