Skip to content

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

EmployeeEJB.java 

EmpWorkInfo.java



git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200818 ce508802-f39f-4f6c-b175-0d175dae99d5
parent eb6b753c
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 29 deletions
webitm-adm/ibase/webitm/ejb/adm/EmpWorkInfo.java
View file @ 438993b5
...@@ -123,6 +123,8 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -123,6 +123,8 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
Date dateOfBirth = null,RetDate = null; Date dateOfBirth = null,RetDate = null;
java.sql.Date birthDateDT =null; java.sql.Date birthDateDT =null;
String retirementDateVarVal = ""; String retirementDateVarVal = "";
String cadreCode = "";
String gradeCode = "";
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end] //Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end]
//Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start] //Modified By Hemlata on[20/11/2014] [As per changes in framework to use genericUtility ][Start]
...@@ -647,27 +649,20 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -647,27 +649,20 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
//Modified by Rohini T on 26/04/19 [end] //Modified by Rohini T on 26/04/19 [end]
empCode = genericUtility.getColumnValue("emp_code", dom); empCode = genericUtility.getColumnValue("emp_code", dom);
System.out.println("empCode:::::::"+empCode); System.out.println("empCode:::::::"+empCode);
//Modified by Rohini T on[15/05/19][start]
varValue = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn)); //Modified by Rohini T on[15/05/19][start]
System.out.println("RetDateString---["+varValue+"]"); String siteCode = "" ;
Timestamp todayDt = new Timestamp(System.currentTimeMillis()); sql = "SELECT PAY_SITE, CADRE, GRADE,BIRTH_DATE FROM EMPLOYEE WHERE EMP_CODE = ?";
//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");
sql = "select birth_date from employee where emp_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
birthDateDT = rs.getDate("birth_date"); siteCode = checkNull(rs.getString("PAY_SITE"));
System.out.println("birthDateDT:::::::"+birthDateDT); cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
birthDateDT = rs.getDate("BIRTH_DATE");
} }
if(rs != null) if(rs != null)
{ {
...@@ -679,6 +674,27 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo ...@@ -679,6 +674,27 @@ public class EmpWorkInfo extends ValidatorEJB implements EmpWorkInfoLocal ,EmpWo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
varValue = checkNull( admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "RETIREMENT_CALC_DBF", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(varValue.equalsIgnoreCase("NULLFOUND"))
{
varValue = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn));
}
//Modified by Rohini T on[15/05/19][end]
System.out.println("RetDateString---["+varValue+"]");
Timestamp todayDt = new Timestamp(System.currentTimeMillis());
//retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","RETIREMENT_DATE",todayDt,conn));
//Modified by Rohini T on [15/05/19][start]
//retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,conn));
retirementDateVarVal = checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "PROTECT_RETIRE_DATE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(retirementDateVarVal.equalsIgnoreCase("NULLFOUND"))
{
retirementDateVarVal = checkNull(admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn));
}
//Modified by Rohini T on [15/05/19][end]
if(varValue == null || varValue.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varValue))
{
System.out.println("Inside null");
if(birthDateDT != null) if(birthDateDT != null)
{ {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
......
webitm-adm/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ 438993b5
...@@ -4270,15 +4270,19 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4270,15 +4270,19 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
empCode = genericUtility.getColumnValue("emp_code", dom); empCode = genericUtility.getColumnValue("emp_code", dom);
System.out.println("empCode:::::::"+empCode); System.out.println("empCode:::::::"+empCode);
sql = "select birth_date from employee where emp_code = ?"; //Modified by Rohini T on[15/05/19][start]
String siteCode = "" ;
sql = "SELECT PAY_SITE, CADRE, GRADE,BIRTH_DATE FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = connection.prepareStatement(sql); pstmt = connection.prepareStatement(sql);
pstmt.setString(1,empCode); pstmt.setString(1,empCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
birthDateDT = rs.getDate("birth_date"); siteCode = checkNull(rs.getString("PAY_SITE"));
System.out.println("birthDateDT:::::::"+birthDateDT); cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
birthDateDT = rs.getDate("BIRTH_DATE");
} }
if(rs != null) if(rs != null)
...@@ -4291,13 +4295,25 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4291,13 +4295,25 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
varVal = checkNull( admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "RETIREMENT_CALC_DBF", new java.sql.Timestamp(System.currentTimeMillis()), connection));
if(varVal.equalsIgnoreCase("NULLFOUND"))
{
varVal = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", connection)); varVal = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", connection));
}
//Modified by Rohini T on[15/05/19][end]
System.out.println("retDateString---["+varVal+"]"); System.out.println("retDateString---["+varVal+"]");
Timestamp todayDt = new Timestamp(System.currentTimeMillis()); 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] //Modified by Rohini T on [15/05/19][start]
retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,connection)); //retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,connection));
//Modified by Rohini T on [19/04/19][end] retirementDateVarVal = checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "PROTECT_RETIRE_DATE", new java.sql.Timestamp(System.currentTimeMillis()), connection));
if(retirementDateVarVal.equalsIgnoreCase("NULLFOUND"))
{
retirementDateVarVal = checkNull(admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", connection));
}
//Modified by Rohini T on [15/05/19][end]
if(varVal == null || varVal.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varVal)) if(varVal == null || varVal.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varVal))
{ {
System.out.println("Inside null"); System.out.println("Inside null");
......
webitm-adm/ibase/webitm/ejb/adm/EmployeeServicePrdAmdIC.java
View file @ 438993b5
...@@ -387,6 +387,13 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -387,6 +387,13 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
Timestamp retDateOld = null,birthDate = null; Timestamp retDateOld = null,birthDate = null;
String empCode = "",fName = "",lName = "",mName = "",periodAmended = "",amendmentType = "",dateAf = "",retdateN = "",retdateO = "",birthDt = ""; String empCode = "",fName = "",lName = "",mName = "",periodAmended = "",amendmentType = "",dateAf = "",retdateN = "",retdateO = "",birthDt = "";
String retDtO = "",retAgeO = "",retirementDateVarVal = ""; String retDtO = "",retAgeO = "",retirementDateVarVal = "";
//Modified by Rohini T on[15/05/19][start]
Timestamp RetDateDT = null;
String varVal = "";
String siteCode = "";
String cadreCode = "";
String gradeCode = "";
//Modified by Rohini T on[15/05/19][end]
try try
{ {
conn = getConnection(); conn = getConnection();
...@@ -431,7 +438,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -431,7 +438,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
valueXmlString.append("<tran_date><![CDATA[").append(todayDate).append("]]></tran_date>\r\n"); valueXmlString.append("<tran_date><![CDATA[").append(todayDate).append("]]></tran_date>\r\n");
valueXmlString.append("<amendment_type>").append("<![CDATA[E]]>").append("</amendment_type>"); valueXmlString.append("<amendment_type>").append("<![CDATA[E]]>").append("</amendment_type>");
valueXmlString.append("<amendment_no><![CDATA[").append(1).append("]]></amendment_no>\r\n"); valueXmlString.append("<amendment_no><![CDATA[").append(1).append("]]></amendment_no>\r\n");
valueXmlString.append("<period_amended><![CDATA[").append(1).append("]]></period_amended>\r\n"); //Modified by Rohini T on[15/05/19][start]
//valueXmlString.append("<period_amended><![CDATA[").append(1).append("]]></period_amended>\r\n");
valueXmlString.append("<period_amended><![CDATA[").append(0).append("]]></period_amended>\r\n");
//Modified by Rohini T on[15/05/19][end]
} }
else if(currentColumn.trim().equalsIgnoreCase("emp_code")) else if(currentColumn.trim().equalsIgnoreCase("emp_code"))
{ {
...@@ -498,7 +508,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -498,7 +508,10 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
} }
else else
{ {
valueXmlString.append("<retirement_date_o protect='1'>").append("<![CDATA[" + birthDt + "]]>").append("</retirement_date_o>\r\n"); //Modified by Rohini T [15/05/19][start]
valueXmlString.append("<retirement_date_o protect='1'>").append("<![CDATA[]]>").append("</retirement_date_o>\r\n");
//valueXmlString.append("<retirement_date_o protect='1'>").append("<![CDATA[" + birthDt + "]]>").append("</retirement_date_o>\r\n");
//Modified by Rohini T [15/05/19][end]
} }
valueXmlString.append("<retirement_age_o protect='1'>").append("<![CDATA[" + retAgeOld + "]]>").append("</retirement_age_o>\r\n"); valueXmlString.append("<retirement_age_o protect='1'>").append("<![CDATA[" + retAgeOld + "]]>").append("</retirement_age_o>\r\n");
valueXmlString.append("<emp_fname_long><![CDATA[").append(fName).append("]]></emp_fname_long>\r\n"); valueXmlString.append("<emp_fname_long><![CDATA[").append(fName).append("]]></emp_fname_long>\r\n");
...@@ -527,8 +540,43 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -527,8 +540,43 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
Timestamp todayDt = new Timestamp(System.currentTimeMillis()); 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] //Modified by Rohini T on [19/04/19][start]
retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,conn)); //retirementDateVarVal = checkNull(admCommon.getSiteEnv("99999","ADM","X","ZZZZZ","PROTECT_RETIRE_DATE",todayDt,conn));
//Modified by Rohini T on [19/04/19][end] //Modified by Rohini T on [19/04/19][end]
//
//Modified by Rohini T on[15/05/19][start]
sql = "SELECT PAY_SITE, CADRE, GRADE,birth_date FROM EMPLOYEE WHERE EMP_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCode = checkNull(rs.getString("PAY_SITE"));
cadreCode = checkNull(rs.getString("CADRE"));
gradeCode = checkNull(rs.getString("GRADE"));
birthDate = rs.getTimestamp("birth_date");
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
varVal = checkNull( admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "RETIREMENT_CALC_DBF", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(varVal.equalsIgnoreCase("NULLFOUND"))
{
varVal = checkNull(admCommon.getEnv("999999", "RETIREMENT_CALC_DBF", conn));
}
retirementDateVarVal = checkNull(admCommon.getAdmEnv(siteCode, cadreCode, gradeCode, "PROTECT_RETIRE_DATE", new java.sql.Timestamp(System.currentTimeMillis()), conn));
if(retirementDateVarVal.equalsIgnoreCase("NULLFOUND"))
{
retirementDateVarVal = checkNull(admCommon.getEnv("999999", "PROTECT_RETIRE_DATE", conn));
}
//Modified by Rohini T on[15/05/19][End]
System.out.println("retirementDate"); System.out.println("retirementDate");
if("E".equalsIgnoreCase(amendmentType)) if("E".equalsIgnoreCase(amendmentType))
{ {
...@@ -537,16 +585,17 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -537,16 +585,17 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
retAgeNew = retAgeOld + periodAmd; retAgeNew = retAgeOld + periodAmd;
//Modified by Rohini T on [25/04/19][end] //Modified by Rohini T on [25/04/19][end]
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
if(varVal == null || varVal.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varVal))
{
if(retDtO != null) if(retDtO != null)
{ {
retierDateOld = (Date) format.parse(retDtO); retierDateOld = (Date) format.parse(retDtO);
cal.setTime(retierDateOld); cal.setTime(retierDateOld);
}
cal.add(Calendar.MONTH, periodAmd); cal.add(Calendar.MONTH, periodAmd);
Date RetDate = cal.getTime(); Date RetDate = cal.getTime();
Timestamp RetDateDT = new Timestamp(RetDate.getTime()); RetDateDT = new Timestamp(RetDate.getTime());
retdateN = getCurrdateAppFormat(RetDateDT); retdateN = getCurrdateAppFormat(RetDateDT);
if("N".equalsIgnoreCase(retirementDateVarVal) ) if("N".equalsIgnoreCase(retirementDateVarVal) )
{ {
...@@ -557,7 +606,49 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -557,7 +606,49 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
valueXmlString.append("<retirement_date_n protect='0'>").append("<![CDATA[" + retdateN + "]]>").append("</retirement_date_n>\r\n"); valueXmlString.append("<retirement_date_n protect='0'>").append("<![CDATA[" + retdateN + "]]>").append("</retirement_date_n>\r\n");
} }
valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>"); valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>");
}
}
//Modified by Rohini T on[15/05/19][start]
else
{
sql = "select DBF_CALC_RETIRE_DATE( ?,?,?) as retirement_date" +
" from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
pstmt.setDouble(2, retAgeNew);
pstmt.setTimestamp(3, birthDate);
rs = pstmt.executeQuery();
if(rs.next())
{
RetDateDT = rs.getTimestamp("retirement_date");
System.out.println("retDateDT:::"+RetDateDT);
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(RetDateDT != null )
{
dateAf = getCurrdateAppFormat(RetDateDT);
}
if("N".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date_n protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>\r\n");
}
else
{
valueXmlString.append("<retirement_date_n protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>\r\n");
}
valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>");
}
//Modified by Rohini T on[15/05/19][end]
} }
else else
{ {
...@@ -568,18 +659,64 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer ...@@ -568,18 +659,64 @@ public class EmployeeServicePrdAmdIC extends ValidatorEJB implements EmployeeSer
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy");
if(varVal == null || varVal.trim().length() == 0 || "NULLFOUND".equalsIgnoreCase(varVal))
{
if(retDtO != null) if(retDtO != null)
{ {
retierDateOld = (Date) format.parse(retDtO); retierDateOld = (Date) format.parse(retDtO);
}
cal.setTime(retierDateOld); cal.setTime(retierDateOld);
cal.add(Calendar.MONTH, -periodAmd); cal.add(Calendar.MONTH, -periodAmd);
Date RetDate = cal.getTime(); Date RetDate = cal.getTime();
Timestamp RetDateDT = new Timestamp(RetDate.getTime()); RetDateDT = new Timestamp(RetDate.getTime());
dateAf = getCurrdateAppFormat(RetDateDT); dateAf = getCurrdateAppFormat(RetDateDT);
valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>"); valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>");
valueXmlString.append("<retirement_date_n>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>"); valueXmlString.append("<retirement_date_n>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>");
} }
}
//Modified by Rohini T on[15/05/19][start]
else
{
sql = "select DBF_CALC_RETIRE_DATE( ?,?,?) as retirement_date" +
" from dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
pstmt.setDouble(2, retAgeNew);
pstmt.setTimestamp(3, birthDate);
rs = pstmt.executeQuery();
if(rs.next())
{
RetDateDT = rs.getTimestamp("retirement_date");
System.out.println("retDateDT:::"+RetDateDT);
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(RetDateDT != null )
{
dateAf = getCurrdateAppFormat(RetDateDT);
}
if("N".equalsIgnoreCase(retirementDateVarVal) )
{
valueXmlString.append("<retirement_date_n protect='1'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>\r\n");
}
else
{
valueXmlString.append("<retirement_date_n protect='0'>").append("<![CDATA[" + dateAf + "]]>").append("</retirement_date_n>\r\n");
}
valueXmlString.append("<retirement_age_n>").append("<![CDATA[" + retAgeNew + "]]>").append("</retirement_age_n>");
}
//Modified by Rohini T on[15/05/19][end]
}
} }
} }
......
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