Skip to content

B
business-java
Commit ce5360dc authored by dpingle's avatar dpingle
Browse files
Options

* updated src file of employee basic info 

EmpBasicInfo.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215115 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 96db7d67
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
webitm-adm/src/ibase/webitm/ejb/adm/EmpBasicInfo.java
View file @ ce5360dc
......@@ -1327,10 +1327,10 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
String relieveDate ="";
//Added by Dipesh on[17/07/2019][End]
//Added by Dipesh on[08/01/2020][Start]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
Timestamp currentDate = null;
Timestamp relievedate = null;
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
//Varibles used in case 1 End
......@@ -2095,10 +2095,10 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
else
{
sql = "";
//Modified by Dipesh on [08/01/2020][Start]
//Modified by Dipesh on [08/01/2020][Start][Request Id: A19JSUN002]
//sql = "select relieve_date from employee where emp_code = ? ";
sql = "select relieve_date , status from employee where emp_code = ? ";
//Modified by Dipesh on [08/01/2020][End]
//Modified by Dipesh on [08/01/2020][End][Request Id: A19JSUN002]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCodeFuncHead);
rs = pstmt.executeQuery();
......@@ -2106,11 +2106,11 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
//Timestamp relieveDateTS = null;
if(rs.next())
{
//Modified by Dipesh on [08/01/2020][Start]
//Modified by Dipesh on [08/01/2020][Start][Request Id: A19JSUN002]
//relieveDateTS = rs.getTimestamp("relieve_date");
relievedate = rs.getTimestamp("relieve_date");
status = checkNull(rs.getString("status"));
//Modified by Dipesh on [08/01/2020][End]
//Modified by Dipesh on [08/01/2020][End][Request Id: A19JSUN002]
}
if ( rs != null )
{
......@@ -2122,7 +2122,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
pstmt.close();
pstmt = null;
}
//Modified by Dipesh on [08/01/2020][Start]
//Modified by Dipesh on [08/01/2020][Start][Request Id: A19JSUN002]
/*if(relieveDateTS != null)
{
errList.add("VMEMPFUHD3");
......@@ -2157,7 +2157,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
}
}
}
//Modified by Dipesh on [08/01/2020][End]
//Modified by Dipesh on [08/01/2020][End][Request Id: A19JSUN002]
}
}
}
......@@ -2411,19 +2411,19 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
}
else
{
//Added by Dipesh on[08/01/2020][Start]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
//sql = "SELECT STATUS FROM EMPLOYEE WHERE EMP_CODE = ? ";
sql = "SELECT STATUS , RELIEVE_DATE FROM EMPLOYEE WHERE EMP_CODE = ? ";
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,reportTo);
rs = pstmt.executeQuery();
if(rs.next())
{
status = checkNull(rs.getString("STATUS"));
//Added by Dipesh on[08/01/2020][Start]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
relievedate = rs.getTimestamp("RELIEVE_DATE");
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
}
System.out.println("status @:::::::::::"+status);
System.out.println("relievedate @:::::::::::"+relievedate);
......@@ -2443,7 +2443,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
System.out.println("Inside status of employee:::::");
//errList.add( "VMEMP2");
errList.add( "VMEMPREP01");//Added by Dipesh on[08/01/2020]
errList.add( "VMEMPREP01");//Added by Dipesh on[08/01/2020][Request Id: A19JSUN002]
errFields.add( childNodeName.toLowerCase() );
msgType = errorType( conn , "VMEMPREP01");
......@@ -2452,7 +2452,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
break;
}
}
//Added by Dipesh on[08/01/2020][Start]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
else if(relievedate != null)
{
if(relievedate.before(currentDate))
......@@ -2468,7 +2468,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
}
}
}
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
else
{
if(reportTo.trim().equalsIgnoreCase(empCode.trim()))
......@@ -2544,21 +2544,21 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
}
else
{
//Modified by Dipesh on [08/01/2020][Start]
//Modified by Dipesh on [08/01/2020][Start][Request Id: A19JSUN002]
//sql = "SELECT RELIEVE_DATE FROM EMPLOYEE WHERE EMP_CODE = ? ";
sql = "SELECT RELIEVE_DATE ,STATUS FROM EMPLOYEE WHERE EMP_CODE = ? ";
//Modified by Dipesh on [08/01/2020][End]
//Modified by Dipesh on [08/01/2020][End][Request Id: A19JSUN002]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,reportToAdmin);
rs = pstmt.executeQuery();
//String relieveDate ="";
if(rs.next())
{
//Added by Dipesh on[08/01/2020][Start]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
//relieveDate = checkNull(rs.getString("RELIEVE_DATE"));
relievedate = rs.getTimestamp("RELIEVE_DATE");
status = checkNull(rs.getString("STATUS"));
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
}
System.out.println("relievedate:::::::::::"+relievedate);
if ( rs != null )
......@@ -2571,7 +2571,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
pstmt.close();
pstmt = null;
}
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
/*if(relieveDate != null && relieveDate.trim().length() > 0)
{
System.out.println("relieveDate exist ");
......@@ -2611,7 +2611,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
}
}
}
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
}
}
}
......@@ -2643,20 +2643,20 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
empCodeHod = checkNull(genericUtility.getColumnValue("emp_code__hod",dom,objContext),false);
if(empCodeHod != null && empCodeHod.length() >0)
{
//Modified by Dipesh on [08/01/2020][Start]
//Modified by Dipesh on [08/01/2020][Start][Request Id: A19JSUN002]
//sql = "SELECT RELIEVE_DATE FROM EMPLOYEE WHERE EMP_CODE = ? ";
sql = "SELECT RELIEVE_DATE , STATUS FROM EMPLOYEE WHERE EMP_CODE = ? ";
//Modified by Dipesh on [08/01/2020][End]
//Modified by Dipesh on [08/01/2020][End][Request Id: A19JSUN002]
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCodeHod);
rs = pstmt.executeQuery();
if(rs.next())
{
//Added by Dipesh on[08/01/2020][Start]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
//relieveDate = checkNull(rs.getString("RELIEVE_DATE"));
relievedate = rs.getTimestamp("RELIEVE_DATE");
status = checkNull(rs.getString("STATUS"));
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
}
else
{
......@@ -2684,7 +2684,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
break;
}
}
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][Start][Request Id: A19JSUN002]
/*if(relieveDate != null && relieveDate.trim().length() > 0)
{
System.out.println("Inside relieveDate == null");
......@@ -2724,7 +2724,7 @@ public class EmpBasicInfo extends ValidatorEJB implements EmpBasicInfoLocal ,Emp
}
}
}
//Added by Dipesh on[08/01/2020][End]
//Added by Dipesh on[08/01/2020][End][Request Id: A19JSUN002]
}
}
}
......
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