Skip to content

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

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
parent 746b58cc
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 57 deletions
webitm-adm/src/ibase/webitm/ejb/adm/EmpBasicInfo.java
View file @ 9912f167
...@@ -195,7 +195,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp ...@@ -195,7 +195,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
if(EmpRetAge.equalsIgnoreCase("NULLFOUND")) if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
{ {
EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn)); EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn));
} }
if(EmpRetAge == null || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND")) if(EmpRetAge == null || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND"))
{ {
EmpRetAge = "0"; EmpRetAge = "0";
...@@ -737,8 +737,8 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp ...@@ -737,8 +737,8 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("cadreCodeDescr ..:: ["+cadreCodeDescr+"]"); System.out.println("cadreCodeDescr ..:: ["+cadreCodeDescr+"]");
valueXmlString.append("<cadre_descr><![CDATA[").append(cadreCodeDescr).append("]]></cadre_descr>\r\n"); valueXmlString.append("<cadre_descr><![CDATA[").append(cadreCodeDescr).append("]]></cadre_descr>\r\n");
//Modified by Rohini T on [21/08/19][Start] //Modified by Rohini T on [21/08/19][Start]
if("A".equalsIgnoreCase(editFlag)) if("A".equalsIgnoreCase(editFlag))
{ {
...@@ -749,7 +749,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp ...@@ -749,7 +749,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
if(EmpRetAge.equalsIgnoreCase("NULLFOUND")) if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
{ {
EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn)); EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", conn));
} }
if(EmpRetAge == null || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND")) if(EmpRetAge == null || EmpRetAge.trim().length() == 0 ||EmpRetAge.equalsIgnoreCase("NULLFOUND"))
{ {
EmpRetAge = "0"; EmpRetAge = "0";
...@@ -799,39 +799,42 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp ...@@ -799,39 +799,42 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("gradeCodeDescr ..:: ["+gradeCodeDescr+"]"); System.out.println("gradeCodeDescr ..:: ["+gradeCodeDescr+"]");
valueXmlString.append("<grade_descr><![CDATA[").append(gradeCodeDescr).append("]]></grade_descr>\r\n"); valueXmlString.append("<grade_descr><![CDATA[").append(gradeCodeDescr).append("]]></grade_descr>\r\n");
if(( cadreCode == null || cadreCode .length() == 0 ) || editFlag.equalsIgnoreCase("A")) if(( cadreCode == null || cadreCode .length() == 0 ) || editFlag.equalsIgnoreCase("A"))
{ {
valueXmlString.append("<cadre_code><![CDATA[").append(cadreCodeGread).append("]]></cadre_code>\r\n"); valueXmlString.append("<cadre_code><![CDATA[").append(cadreCodeGread).append("]]></cadre_code>\r\n");
sql = "SELECT DESCR FROM CADRE WHERE CADRE_CODE = ? "; sql = "SELECT DESCR FROM CADRE WHERE CADRE_CODE = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,cadreCodeGread); pstmt.setString(1,cadreCodeGread);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
cadreCodeDescr = checkNull(rs.getString("DESCR")); cadreCodeDescr = checkNull(rs.getString("DESCR"));
} }
if( rs != null ) if( rs != null )
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }
if( pstmt != null ) if( pstmt != null )
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
}
System.out.println("cadreCodeDescr ..:: ["+cadreCodeDescr+"]");
valueXmlString.append("<cadre_descr><![CDATA[").append(cadreCodeDescr).append("]]></cadre_descr>\r\n");
} }
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] //Modified by Rohini T on [21/08/19][Start]
if("A".equalsIgnoreCase(editFlag)) if("A".equalsIgnoreCase(editFlag))
{ {
//Modified by Rohini T on [28/08/19][Start] //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(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] //Modified by Rohini T on [28/08/19][End]
if(EmpRetAge.equalsIgnoreCase("NULLFOUND")) if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
{ {
......
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ 9912f167
...@@ -3432,7 +3432,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3432,7 +3432,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
EmpRetAge = "0"; EmpRetAge = "0";
} }
// Piyush - 29/07/2019.Start // Piyush - 29/07/2019.Start
// int maval1=Integer.parseInt(EmpRetAge); // int maval1=Integer.parseInt(EmpRetAge);
int maval1 = 0; int maval1 = 0;
...@@ -3454,11 +3453,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3454,11 +3453,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
maval1=maval1*12; maval1=maval1*12;
} }
valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>"); valueXmlString.append("<retirement_age>").append(maval1).append("</retirement_age>");
setNodeValue(dom, "retirement_age", "" + maval1); // Piyush - 29/07/2019 setNodeValue(dom, "retirement_age", "" + maval1); // Piyush - 29/07/2019
String retDateStr = gbSetRetirementDate(dom, connection); String retDateStr = gbSetRetirementDate(dom, connection);
//Modified by Rohini T on [28/08/19][Start] //Modified by Rohini T on [28/08/19][Start]
//String protect= gbfGetRetdateProtectFlag(dom); //String protect= gbfGetRetdateProtectFlag(dom);
...@@ -4305,7 +4301,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4305,7 +4301,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
if(gradeCodedoc == null ||gradeCodedoc.trim().length() == 0 || editFlg.equals("A")) if(gradeCodedoc == null ||gradeCodedoc.trim().length() == 0 || editFlg.equals("A"))
{ {
valueXmlString.append("<cadre_code>").append("<![CDATA[" + cadreCode + "]]>").append("</cadre_code>"); 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 = ? " ; sql = " SELECT DESCR FROM CADRE WHERE CADRE_CODE = ? " ;
pstmt1 = connection.prepareStatement(sql); pstmt1 = connection.prepareStatement(sql);
pstmt1.setString(1, cadreCode); pstmt1.setString(1, cadreCode);
...@@ -4373,7 +4372,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4373,7 +4372,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<retirement_date protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n"); valueXmlString.append("<retirement_date protect=\""+protect+"\"><![CDATA[").append(retDateStr).append("]]></retirement_date>\r\n");
setNodeValue(dom, "retirement_date", "" + retDateStr); setNodeValue(dom, "retirement_date", "" + retDateStr);
//Modified by Rohini T on 28/08/19[End] //Modified by Rohini T on 28/08/19[End]
} }
//Modified by Rohini T on 21/08/19[End] //Modified by Rohini T on 21/08/19[End]
} }
...@@ -6701,8 +6700,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6701,8 +6700,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
currentDate = java.sql.Timestamp.valueOf(sdf1.format(today) + " 00:00:00.000"); currentDate = java.sql.Timestamp.valueOf(sdf1.format(today) + " 00:00:00.000");
//Modified by Poonam B on 12/07/2019[START].To add checkNull method //Modified by Poonam B on 12/07/2019[START].To add checkNull method
/*lsEmpSite= genericUtility.getColumnValue("emp_site", dom); /*lsEmpSite= genericUtility.getColumnValue("emp_site", dom);
lsCadreCode= genericUtility.getColumnValue("cadre_code", dom); lsCadreCode= genericUtility.getColumnValue("cadre_code", dom);
lsGradeCode= genericUtility.getColumnValue("grade_code", dom);*/ lsGradeCode= genericUtility.getColumnValue("grade_code", dom);*/
lsEmpCode=checkNull(genericUtility.getColumnValue("emp_code", dom));// Added By Poonam [25-07-2019] lsEmpCode=checkNull(genericUtility.getColumnValue("emp_code", dom));// Added By Poonam [25-07-2019]
lsEmpSite=checkNull(genericUtility.getColumnValue("emp_site", dom)); lsEmpSite=checkNull(genericUtility.getColumnValue("emp_site", dom));
lsCadreCode=checkNull(genericUtility.getColumnValue("cadre_code", dom)); lsCadreCode=checkNull(genericUtility.getColumnValue("cadre_code", dom));
...@@ -6711,23 +6710,22 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6711,23 +6710,22 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 28/08/19[Start] //Modified by Rohini T on 28/08/19[Start]
// } // }
//Modified by Rohini T on 28/08/19[End] //Modified by Rohini T on 28/08/19[End]
lsVarValue=admCommon.getAdmEnv(lsEmpSite, lsCadreCode, lsGradeCode, "PROTECT_RETIRE_DATE",today, conn); lsVarValue=admCommon.getAdmEnv(lsEmpSite, lsCadreCode, lsGradeCode, "PROTECT_RETIRE_DATE",today, conn);
if("NULLFOUND".equalsIgnoreCase(lsVarValue)) if("NULLFOUND".equalsIgnoreCase(lsVarValue))
{ {
lsVarValue=admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn); lsVarValue=admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn);
} }
if(lsVarValue==null || !lsVarValue.toUpperCase().equalsIgnoreCase("Y"))
if(lsVarValue==null || !lsVarValue.toUpperCase().equalsIgnoreCase("Y")) //if isnull(ls_var_value) or upper(ls_var_value) <> "Y" then
//if isnull(ls_var_value) or upper(ls_var_value) <> "Y" then {
{ lsProtVal="0";
lsProtVal="0"; }
} else
else {
{ lsProtVal="1";
lsProtVal="1"; }
}
//Modified by Rohini T on 28/08/19[Start] //Modified by Rohini T on 28/08/19[Start]
} }
//Modified by Rohini T on 28/08/19[End] //Modified by Rohini T on 28/08/19[End]
} }
catch (Exception e) catch (Exception e)
...@@ -6747,7 +6745,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6747,7 +6745,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
String retAgeStr=""; String retAgeStr="";
String empCode=""; String empCode="";
String retVal=""; String retVal="";
String retirementVarvalue=""; String retirementVarvalue= "";
String siteCode=""; String siteCode="";
String gradeCode=""; String gradeCode="";
String cadreCode=""; String cadreCode="";
...@@ -6805,7 +6803,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6805,7 +6803,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
today = new java.sql.Timestamp(System.currentTimeMillis()) ; today = new java.sql.Timestamp(System.currentTimeMillis()) ;
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
currentDate = java.sql.Timestamp.valueOf(sdf1.format(today) + " 00:00:00.000"); currentDate = java.sql.Timestamp.valueOf(sdf1.format(today) + " 00:00:00.000");
retirementVarvalue=checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "RETIREMENT_CALC_DBF",currentDate, conn)); retirementVarvalue=checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "RETIREMENT_CALC_DBF",currentDate, conn));
if("NULLFOUND".equalsIgnoreCase(retirementVarvalue)) if("NULLFOUND".equalsIgnoreCase(retirementVarvalue))
{ {
...@@ -6822,7 +6819,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6822,7 +6819,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
retirementVarvalue=""; retirementVarvalue="";
} }
} }
if(retirementVarvalue != null && retirementVarvalue.trim().length() > 0) if(retirementVarvalue != null && retirementVarvalue.trim().length() > 0)
{ {
sql = "SELECT "+retirementVarvalue+"(?,?,?)as retDate FROM DUAL"; sql = "SELECT "+retirementVarvalue+"(?,?,?)as retDate FROM DUAL";
......
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