Skip to content

B
business-java
Commit b7eb5d82 authored by rtelang's avatar rtelang
Browse files
Options

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
parent 78f8e5ea
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 25 deletions
webitm-adm/src/ibase/webitm/ejb/adm/EmpBasicInfo.java
View file @ b7eb5d82
......@@ -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
View file @ b7eb5d82
......@@ -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());
......
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ b7eb5d82
......@@ -3357,6 +3357,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
Date dateOfBirth = null,retDate = null;
int retirementAge = 0;
java.sql.Date birthDateDT =null;
String EmpRetAge = "";
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end]
try
{
......@@ -3420,7 +3421,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
valueXmlString.append("<m_status>").append("<![CDATA[U]]>").append("</m_status>");
//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));
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));
......@@ -3459,8 +3460,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
setNodeValue(dom, "retirement_age", "" + maval1); // Piyush - 29/07/2019
String retDateStr = gbSetRetirementDate(dom, connection);
String protect= gbfGetRetdateProtectFlag(dom);
//Modified by Rohini T on [28/08/19][Start]
//String protect= gbfGetRetdateProtectFlag(dom);
String protect= gbfGetRetdateProtectFlag(dom,connection);
//Modified by Rohini T on [28/08/19][End]
valueXmlString.append("<retirement_date protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
//gbf_itemchg_modifier_ds(dw_edit,"retirement_date","protect", gbf_get_retdate_protect_flag())
......@@ -3897,8 +3900,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<revision_no><![CDATA[").append(revisionNo).append("]]></revision_no>\r\n");
String retirmentDate = checkNull(genericUtility.getColumnValue("retirement_date", dom));
String protect=gbfGetRetdateProtectFlag(dom);
//Modified by Rohini T on [28/08/19][Start]
//String protect=gbfGetRetdateProtectFlag(dom);
String protect=gbfGetRetdateProtectFlag(dom,connection);
//Modified by Rohini T on [28/08/19][End]
valueXmlString.append("<retirement_date protect=\""+protect+"\"><![CDATA[").append(retirmentDate).append("]]></retirement_date>\r\n");
String totExp = checkNull(genericUtility.getColumnValue("revision_no", dom));
......@@ -4322,9 +4327,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 21/08/19[Start]
if("A".equalsIgnoreCase(editFlag))
{
//Modified by Rohini T on 28/08/19[Start]
int maval1 = gbSetRetirementAge(dom, connection);
valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
setNodeValue(dom, "retirement_age", "" + maval1);
String retDateStr = gbSetRetirementDate(dom, connection);
String protect= gbfGetRetdateProtectFlag(dom);
String protect= gbfGetRetdateProtectFlag(dom,connection);
valueXmlString.append("<retirement_date protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
setNodeValue(dom, "retirement_date", "" + retDateStr);
//Modified by Rohini T on 28/08/19[End]
}
//Modified by Rohini T on 21/08/19[End]
......@@ -4353,9 +4364,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 21/08/19[Start]
if("A".equalsIgnoreCase(editFlag))
{
//Modified by Rohini T on 28/08/19[Start]
int maval1 = gbSetRetirementAge(dom, connection);
valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
setNodeValue(dom, "retirement_age", "" + maval1);
String retDateStr = gbSetRetirementDate(dom, connection);
String protect= gbfGetRetdateProtectFlag(dom);
String protect= gbfGetRetdateProtectFlag(dom,connection);
valueXmlString.append("<retirement_date protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
setNodeValue(dom, "retirement_date", "" + retDateStr);
//Modified by Rohini T on 28/08/19[End]
}
//Modified by Rohini T on 21/08/19[End]
}
......@@ -4386,9 +4403,15 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 21/08/19[Start]
if("A".equalsIgnoreCase(editFlag))
{
//Modified by Rohini T on 28/08/19[Start]
int maval1 = gbSetRetirementAge(dom, connection);
valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
setNodeValue(dom, "retirement_age", "" + maval1);
String retDateStr = gbSetRetirementDate(dom, connection);
String protect= gbfGetRetdateProtectFlag(dom);
String protect= gbfGetRetdateProtectFlag(dom,connection);
valueXmlString.append("<retirement_date protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
setNodeValue(dom, "retirement_date", "" + retDateStr);
//Modified by Rohini T on 28/08/19[End]
}
//Modified by Rohini T on 21/08/19[End]
}
......@@ -6617,8 +6640,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end]
private String gbfGetRetdateProtectFlag(Document dom) throws ITMException
//Modified by Rohini T on 28/08/19[Start]
//private String gbfGetRetdateProtectFlag(Document dom) throws ITMException
private String gbfGetRetdateProtectFlag(Document dom,Connection conn) throws ITMException
//Modified by Rohini T on 28/08/19[End]
//gbf_get_retdate_protect_flag()
{
String lsEmpSite="";
......@@ -6633,13 +6658,16 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
String ldtRelieveDate="";
String ldbirthDate = "";
//int liProtVal=0;
Connection conn=null;
//Modified by Rohini T on [28/08/19][Start]
//Connection conn=null;
//Modified by Rohini T on [28/08/19][End]
E12GenericUtility genericUtility = new E12GenericUtility();
AdmCommon admCommon = new AdmCommon();
try
{
conn=getConnection();
//Modified by Rohini T on [28/08/19][Start]
// conn=getConnection();
//Modified by Rohini T on [28/08/19][End]
//Modified by Poonam B on 12/07/2019[START].To add checkNull method
//ldt_relieve_date = dw_edit.getitemdatetime(1,"relieve_date")
//lsStatus=genericUtility.getColumnValue("status", dom);
......@@ -6658,7 +6686,11 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
//Added by Poonam B on [25/07/2019][END]
*/
if(ldtRelieveDate !=null || (lsStatus != null && lsStatus.equalsIgnoreCase("S")))
//Modified by Rohini T on 28/08/19[Start]
// if(ldtRelieveDate !=null || (lsStatus != null && lsStatus.equalsIgnoreCase("S")))
if((ldtRelieveDate !=null && ldtRelieveDate.trim().length() > 0) || (lsStatus != null && lsStatus.equalsIgnoreCase("S")))
//Modified by Rohini T on 28/08/19[End]
{
lsProtVal="1";
}
......@@ -6675,11 +6707,11 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
lsEmpSite=checkNull(genericUtility.getColumnValue("emp_site", dom));
lsCadreCode=checkNull(genericUtility.getColumnValue("cadre_code", dom));
lsGradeCode=checkNull(genericUtility.getColumnValue("grade_code", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method
}
//Modified by Rohini T on 28/08/19[Start]
// }
//Modified by Rohini T on 28/08/19[End]
lsVarValue=admCommon.getAdmEnv(lsEmpSite, lsCadreCode, lsGradeCode, "PROTECT_RETIRE_DATE",today, conn);
if("NULLFOUND".equalsIgnoreCase(lsVarValue))
{
lsVarValue=admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn);
......@@ -6694,6 +6726,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{
lsProtVal="1";
}
//Modified by Rohini T on 28/08/19[Start]
}
//Modified by Rohini T on 28/08/19[End]
}
catch (Exception e)
{
......@@ -6743,7 +6778,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//retAgeStr=checkNull(genericUtility.getColumnValue("retirement_age", dom));
retAgeStr=checkInt(genericUtility.getColumnValue("retirement_age", dom));
BirthDate=checkNull(genericUtility.getColumnValue("birth_date", dom));
try
{
retAge = Integer.parseInt(retAgeStr);
......@@ -6773,7 +6807,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
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);
......@@ -6819,7 +6852,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
retDateStr = sdf.format(new Date(retirementDate.getTime()));
//valueXmlString.append("<bank_name>").append("<![CDATA["+ rs.getString("BANK_NAME") +"]]>").append("</bank_name>");
}
catch (Exception e)
{
......@@ -7022,4 +7054,54 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
tempNode = null;
}
// Piyush - 29/07/2019.End
//Modified by Rohini T on 28/08/19[Start]
private int gbSetRetirementAge(Document dom,Connection conn) throws ITMException
{
String siteCode = "";
String gradeCode = "";
String cadreCode = "";
String EmpRetAge = "";
int maval1 = 0;
AdmCommon admCommon = new AdmCommon();
try
{
siteCode=checkNull(genericUtility.getColumnValue("emp_site", dom));
gradeCode=checkNull(genericUtility.getColumnValue("grade_code", dom));
cadreCode=checkNull(genericUtility.getColumnValue("cadre_code", dom));
EmpRetAge = checkNull(admCommon.getAdmEnv(siteCode, 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));
System.out.println("Inside getEnv..EmpRetAge"+EmpRetAge);
}
if(EmpRetAge == null || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND"))
{
EmpRetAge = "0";
}
try
{
maval1=Integer.parseInt(EmpRetAge);
}
catch (Exception ei)
{
maval1 = 0;
}
if(maval1 <=0 )
{
maval1=0;
}
if(maval1 <=100)
{
maval1=maval1*12;
}
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
return maval1;
}
//Modified by Rohini T on 28/08/19[End]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment