Commit 486439c2 authored by sghate's avatar sghate

Updated component EmployeeEJB.java on 10/12/2019


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213534 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c1a24647
...@@ -26,6 +26,7 @@ import java.util.ArrayList; ...@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.StringTokenizer;
import javax.ejb.Stateless; import javax.ejb.Stateless;
...@@ -144,6 +145,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -144,6 +145,14 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
ResultSet rs=null; ResultSet rs=null;
ArrayList<String> errList = new ArrayList<String>(); ArrayList<String> errList = new ArrayList<String>();
ArrayList<String> errFields = new ArrayList<String>(); ArrayList<String> errFields = new ArrayList<String>();
String roleProfiles = "",roleProfile = "";
int cnt1 = 0;
String[] roleProfilesList;
String sql = "";
String errStr = "";
String actStatus = "", activeStatus = "";
try try
{ {
//ConnDriver connDriver = new ConnDriver(); //ConnDriver connDriver = new ConnDriver();
...@@ -232,7 +241,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -232,7 +241,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
System.out.println("EMPcode::::::["+empCode+"]"); System.out.println("EMPcode::::::["+empCode+"]");
//String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW='w_emp_master'"; //String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW='w_emp_master'";
//String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW = 'w_emp_complete'";//Modified By Poonam B on[25-07-2019] //String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW = 'w_emp_complete'";//Modified By Poonam B on[25-07-2019]
String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW = 'w_emp_temp'";//Modified By Poonam B on[26-07-2019] String sqlKey="SELECT KEY_FLAG FROM TRANSETUP WHERE TRAN_WINDOW = 'w_emp_complete'";//Modified By Poonam B on[26-07-2019]
pstmt=conn.prepareStatement(sqlKey); pstmt=conn.prepareStatement(sqlKey);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
while(rs.next()) while(rs.next())
...@@ -280,7 +289,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -280,7 +289,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
cnt = 0; cnt = 0;
String mval1 = empCode.replace("'","$"); String mval1 = empCode.replace("'","$");
String sql = "select DDF_CHK_SPLCHAR(?) as cnt from dual"; sql = "select DDF_CHK_SPLCHAR(?) as cnt from dual";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mval1); pstmt.setString(1, mval1);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -532,7 +541,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -532,7 +541,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(funcGroup != null && funcGroup.length() > 0) if(funcGroup != null && funcGroup.length() > 0)
{ {
String sql = "select count(*) as cnt from busi_functions where func_code = ? "; sql = "select count(*) as cnt from busi_functions where func_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, funcGroup); pstmt.setString(1, funcGroup);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -565,7 +574,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -565,7 +574,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(empCodeFuncHead != null && empCodeFuncHead.length() > 0) if(empCodeFuncHead != null && empCodeFuncHead.length() > 0)
{ {
String sql = "select count(*) as cnt from employee where emp_code = ? "; sql = "select count(*) as cnt from employee where emp_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCodeFuncHead); pstmt.setString(1, empCodeFuncHead);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -631,7 +640,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -631,7 +640,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
// Modified by Yashwant on 26/06/2019.End // Modified by Yashwant on 26/06/2019.End
if(buCode != null && buCode.length() > 0) if(buCode != null && buCode.length() > 0)
{ {
String sql = "select count(*) as cnt from business_units where bu_code = ? "; sql = "select count(*) as cnt from business_units where bu_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, buCode); pstmt.setString(1, buCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -936,7 +945,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -936,7 +945,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
joinDate = sdf.parse(dateJoinStr); joinDate = sdf.parse(dateJoinStr);
} }
//Added by Poonam B on[16.07.2019].end.to check date format //Added by Poonam B on[16.07.2019].end.to check date format
String sql="select dept_code, pos_code from employee where emp_code = ?"; sql="select dept_code, pos_code 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();
...@@ -984,7 +993,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -984,7 +993,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Poonam B on 12/07/2019[END].To add checkNull method //Modified by Poonam B on 12/07/2019[END].To add checkNull method
if(bankCode != null && bankCode.trim().length() > 0) if(bankCode != null && bankCode.trim().length() > 0)
{ {
String sql="Select count(*) as cnt from bank where bank_code = ?"; sql="Select count(*) as cnt from bank where bank_code = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, bankCode); pstmt.setString(1, bankCode);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
...@@ -2300,7 +2309,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2300,7 +2309,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
/*String sql="select count(*) as cnt from gencodes where fld_name = 'LANGUAGE' and mod_name in ('W_EMP_COMPLETE' , 'X')" /*String sql="select count(*) as cnt from gencodes where fld_name = 'LANGUAGE' and mod_name in ('W_EMP_COMPLETE' , 'X')"
+ " and case when active is null then 'Y' else active END = 'Y' and fld_value = ? ";*/ + " and case when active is null then 'Y' else active END = 'Y' and fld_value = ? ";*/
String sql="select count(*) as cnt from gencodes where fld_name = 'LANGUAGE' and mod_name in ('W_EMP_TEMP' , 'X')" sql="select count(*) as cnt from gencodes where fld_name = 'LANGUAGE' and mod_name in ('W_EMP_COMPLETE' , 'X')"
+ " and case when active is null then 'Y' else active END = 'Y' and fld_value = ? "; // Added By Poonam B[26-07-2019] + " and case when active is null then 'Y' else active END = 'Y' and fld_value = ? "; // Added By Poonam B[26-07-2019]
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, motherTongue); pstmt.setString(1, motherTongue);
...@@ -2330,7 +2339,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2330,7 +2339,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
if(castCategory != null && castCategory.trim().length() > 0) if(castCategory != null && castCategory.trim().length() > 0)
{ {
/*String sql="select count(*) as cnt from gencodes where fld_name = 'CAST_CATEGORY' and mod_name in ('W_EMP_COMPLETE' , 'X') and case when active is null then 'Y' else active END = 'Y' and fld_value = ? ";*/ /*String sql="select count(*) as cnt from gencodes where fld_name = 'CAST_CATEGORY' and mod_name in ('W_EMP_COMPLETE' , 'X') and case when active is null then 'Y' else active END = 'Y' and fld_value = ? ";*/
String sql="select count(*) as cnt from gencodes where fld_name = 'cast_category' and mod_name in ('w_emp_temp' , 'X') and " sql ="select count(*) as cnt from gencodes where fld_name = 'CAST_CATEGORY' and mod_name in ('W_EMP_COMPLETE' , 'X') and "
+ "case when active is null then 'Y' else active END = 'Y' and fld_value = ? "; // Added by Poonam B [26-07-2019] + "case when active is null then 'Y' else active END = 'Y' and fld_value = ? "; // Added by Poonam B [26-07-2019]
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, castCategory); pstmt.setString(1, castCategory);
...@@ -2419,10 +2428,65 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -2419,10 +2428,65 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
// Added By Poonam[09/07/2019].end // Added By Poonam[09/07/2019].end
//Added by Shital on 10/12/2019 [Start]
if(childNodeName.equalsIgnoreCase("role_profiles"))
{
roleProfiles = checkNull(genericUtility.getColumnValue("role_profiles", dom));
System.out.println(":::roleProfiles::"+roleProfiles);
if(roleProfiles != null && roleProfiles.trim().length() > 0)
{
roleProfilesList = roleProfiles.split(",");
System.out.println("lenght----------"+roleProfilesList.length);
System.out.println("roleProfiles11111111111111"+roleProfiles);
sql = "select count(*) as cnt1, act_status from role_profile where role_profile =? group by ACT_STATUS ";
pstmt = conn.prepareStatement(sql);
for(int i = 0; i < roleProfilesList.length; i++)
{
pstmt.setString( 1, roleProfilesList[i] );
rs = pstmt.executeQuery();
pstmt.clearParameters();
if(rs.next())
{
cnt1 = rs.getInt("cnt1");
actStatus = rs.getString("act_status");
}
System.out.println(":::::cnt1:::::::"+cnt1);
System.out.println(":::::actStatus:::::::"+actStatus);
if(cnt1 == 0)
{
errStr = "The specified "+roleProfilesList[i]+" does not exist in role profile master, first define the same";
errString = getErrorMessage("Invalid Role Profile!", errStr, "VMROLPRF01", "", "E");
return errString;
}
if("N".equalsIgnoreCase(actStatus))
{
errStr = "The specified "+roleProfilesList[i]+" is inactive hence it can not be assigned, please select active role profile from the list";
errString = getErrorMessage("Inactive Role Profile!", errStr, "VMROLPRF02", "", "E");
return errString;
}
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if (rs != null)
{
rs.close();
rs = null;
}
}
}
//Added by Shital on 10/12/2019 [End]
} }
} }
break; break;
} }
case 2 : case 2 :
System.out.println("Validation for Detail 2 Employee.........."); System.out.println("Validation for Detail 2 Employee..........");
parentNodeList = dom.getElementsByTagName("Detail2"); parentNodeList = dom.getElementsByTagName("Detail2");
...@@ -3362,6 +3426,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3362,6 +3426,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
String EmpRetAge = ""; String EmpRetAge = "";
//Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end] //Modified by Rohini T on 27/March/2019[Req ID:A18KSUN005][end]
String birthDt = "";//Added by Rohini on 24/09/19 String birthDt = "";//Added by Rohini on 24/09/19
String roleProfDescr = "";
String roleProfiles = "";
try try
{ {
System.out.println("CURRENT COLUMN:::::"+currentColumn); System.out.println("CURRENT COLUMN:::::"+currentColumn);
...@@ -3431,7 +3498,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -3431,7 +3498,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
valueXmlString.append("<m_status>").append("<![CDATA[U]]>").append("</m_status>"); valueXmlString.append("<m_status>").append("<![CDATA[U]]>").append("</m_status>");
//Modified by Rohini T on [21/08/19][Start] //Modified by Rohini T on [21/08/19][Start]
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")) if(EmpRetAge.equalsIgnoreCase("NULLFOUND"))
{ {
EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", connection)); EmpRetAge = checkNull(admCommon.getEnv("999999", "EMP_RETIREMENT_AGE", connection));
...@@ -4337,7 +4404,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4337,7 +4404,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 23/09/19[Start] //Modified by Rohini T on 23/09/19[Start]
//if("A".equalsIgnoreCase(editFlag)) //if("A".equalsIgnoreCase(editFlag))
if("A".equalsIgnoreCase(editFlg)) if("A".equalsIgnoreCase(editFlg))
//Modified by Rohini T on 23/09/19[End] //Modified by Rohini T on 23/09/19[End]
{ {
//Modified by Rohini T on 28/08/19[Start] //Modified by Rohini T on 28/08/19[Start]
int maval1 = gbSetRetirementAge(dom, connection); int maval1 = gbSetRetirementAge(dom, connection);
...@@ -4377,7 +4444,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4377,7 +4444,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 23/09/19[Start] //Modified by Rohini T on 23/09/19[Start]
//if("A".equalsIgnoreCase(editFlag)) //if("A".equalsIgnoreCase(editFlag))
if("A".equalsIgnoreCase(editFlg)) if("A".equalsIgnoreCase(editFlg))
//Modified by Rohini T on 23/09/19[End] //Modified by Rohini T on 23/09/19[End]
{ {
//Modified by Rohini T on 28/08/19[Start] //Modified by Rohini T on 28/08/19[Start]
int maval1 = gbSetRetirementAge(dom, connection); int maval1 = gbSetRetirementAge(dom, connection);
...@@ -4419,7 +4486,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4419,7 +4486,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on 23/09/19[Start] //Modified by Rohini T on 23/09/19[Start]
//if("A".equalsIgnoreCase(editFlag)) //if("A".equalsIgnoreCase(editFlag))
if("A".equalsIgnoreCase(editFlg)) if("A".equalsIgnoreCase(editFlg))
//Modified by Rohini T on 23/09/19[End] //Modified by Rohini T on 23/09/19[End]
{ {
//Modified by Rohini T on 28/08/19[Start] //Modified by Rohini T on 28/08/19[Start]
int maval1 = gbSetRetirementAge(dom, connection); int maval1 = gbSetRetirementAge(dom, connection);
...@@ -4533,6 +4600,30 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -4533,6 +4600,30 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
} }
//Modified by poonam B[31/10/2019][START][To append Description of cast_category]
else if(currentColumn.trim().equalsIgnoreCase("cast_category"))
{
System.out.println("ItemChange of:::::"+currentColumn);
String castCategory = checkNull( genericUtility.getColumnValue("cast_category",dom));
System.out.println("cast_category is:::::"+castCategory);
String descr = "";
if(castCategory != null && castCategory.trim().length() > 0)
{
sql = "select descr from gencodes where fld_name = 'CAST_CATEGORY' and mod_name in ('W_EMP_COMPLETE' , 'X') and case when active is null then 'Y' else active END = 'Y' and fld_value = ? ";
pstmt=connection.prepareStatement(sql);
pstmt.setString(1, castCategory);
rs = pstmt.executeQuery();
while(rs.next())
{
descr = rs.getString("descr");
System.out.println("descr of cast_category is:::::"+descr);
}
close(pstmt, rs);
valueXmlString.append("<cast_category_descr>").append("<![CDATA["+descr+"]]>").append("</cast_category_descr>");
}
}
//Modified by poonam B[31/10/2019][END][To append Description of cast_category]
else if(currentColumn.trim().equalsIgnoreCase("cur_add1")) else if(currentColumn.trim().equalsIgnoreCase("cur_add1"))
{ {
System.out.println("ItemChange of:::::"+currentColumn); System.out.println("ItemChange of:::::"+currentColumn);
...@@ -5332,6 +5423,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5332,6 +5423,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
while(rs.next()) while(rs.next())
{ {
descr = rs.getString("POS_DESCR"); descr = rs.getString("POS_DESCR");
System.out.println("descr of POS_DESCR::::" +descr);
} }
close(pstmt, rs); close(pstmt, rs);
if(descr != null && descr.trim().length() > 0) if(descr != null && descr.trim().length() > 0)
...@@ -5672,6 +5764,39 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5672,6 +5764,39 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<"+newColumn+">").append("<![CDATA[" + value + "]]>").append("</"+newColumn+">"); valueXmlString.append("<"+newColumn+">").append("<![CDATA[" + value + "]]>").append("</"+newColumn+">");
} }
//Modified by Azhar K. on 19/April/2019[To Trim Column name and value of employee name to process validation][End] //Modified by Azhar K. on 19/April/2019[To Trim Column name and value of employee name to process validation][End]
//Added by Shital on 06/12/2019[Start]
if (currentColumn.trim().equals("role_profiles"))
{
//FN_GET_ROLEPROF_DESCR(employee.role_profiles) as descr
roleProfiles = genericUtility.getColumnValue("role_profiles", dom);
sql="select fn_get_roleprof_descr (?) as descr from dual";
System.out.println("@S@*SQL:****************"+sql);
pstmt = connection.prepareStatement( sql );
pstmt.setString(1,roleProfiles);
rs = pstmt.executeQuery();
if( rs.next())
{
roleProfDescr =checkNull(rs.getString("descr"));
}
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
valueXmlString.append( "<descr><![CDATA[" ).append( roleProfDescr ).append( "]]></descr>\r\n" );
}
//Added by Shital on 06/12/2019[End]
valueXmlString.append ("</Detail1>\r\n"); valueXmlString.append ("</Detail1>\r\n");
} }
break; break;
...@@ -5719,17 +5844,17 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -5719,17 +5844,17 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<seq_no protect=\"1\"><![CDATA["+ seqNo +"]]></seq_no>\r\n"); valueXmlString.append("<seq_no protect=\"1\"><![CDATA["+ seqNo +"]]></seq_no>\r\n");
} }
// Modified by Dipesh on 09/10/2019.Start // Modified by Dipesh on 09/10/2019.Start
/*valueXmlString.append("<grat_nominee protect=\"1\"><![CDATA[N]]></grat_nominee>\r\n"); /*valueXmlString.append("<grat_nominee protect=\"1\"><![CDATA[N]]></grat_nominee>\r\n");
valueXmlString.append("<pf_nominee protect=\"1\"><![CDATA[N]]></pf_nominee >\r\n"); valueXmlString.append("<pf_nominee protect=\"1\"><![CDATA[N]]></pf_nominee >\r\n");
valueXmlString.append("<pen_nominee protect=\"1\"><![CDATA[N]]></pen_nominee>\r\n"); valueXmlString.append("<pen_nominee protect=\"1\"><![CDATA[N]]></pen_nominee>\r\n");
*/ */
valueXmlString.append("<grat_nominee ><![CDATA[").append("N").append("]]></grat_nominee>\r\n"); valueXmlString.append("<grat_nominee ><![CDATA[").append("N").append("]]></grat_nominee>\r\n");
valueXmlString.append("<pf_nominee ><![CDATA[").append("N").append("]]></pf_nominee>\r\n"); valueXmlString.append("<pf_nominee ><![CDATA[").append("N").append("]]></pf_nominee>\r\n");
valueXmlString.append("<pen_nominee ><![CDATA[").append("N").append("]]></pen_nominee>\r\n"); valueXmlString.append("<pen_nominee ><![CDATA[").append("N").append("]]></pen_nominee>\r\n");
// Modified by Dipesh on 09/10/2019.End // Modified by Dipesh on 09/10/2019.End
//Modified by Rohini T on 15/March/2019[A17HSUN005][start] //Modified by Rohini T on 15/March/2019[A17HSUN005][start]
valueXmlString.append("<is_alive>").append("<![CDATA[Y]]>").append("</is_alive>"); valueXmlString.append("<is_alive>").append("<![CDATA[Y]]>").append("</is_alive>");
//Modified by Rohini T on 15/March/2019[A17HSUN005][end] //Modified by Rohini T on 15/March/2019[A17HSUN005][end]
...@@ -6708,7 +6833,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6708,7 +6833,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
try try
{ {
//Modified by Rohini T on [28/08/19][Start] //Modified by Rohini T on [28/08/19][Start]
// conn=getConnection(); // conn=getConnection();
//Modified by Rohini T on [28/08/19][End] //Modified by Rohini T on [28/08/19][End]
//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
//ldt_relieve_date = dw_edit.getitemdatetime(1,"relieve_date") //ldt_relieve_date = dw_edit.getitemdatetime(1,"relieve_date")
...@@ -6728,10 +6853,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6728,10 +6853,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
} }
//Added by Poonam B on [25/07/2019][END] //Added by Poonam B on [25/07/2019][END]
*/ */
//Modified by Rohini T on 28/08/19[Start] //Modified by Rohini T on 28/08/19[Start]
// if(ldtRelieveDate !=null || (lsStatus != null && lsStatus.equalsIgnoreCase("S"))) // if(ldtRelieveDate !=null || (lsStatus != null && lsStatus.equalsIgnoreCase("S")))
if((ldtRelieveDate !=null && ldtRelieveDate.trim().length() > 0) || (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] //Modified by Rohini T on 28/08/19[End]
{ {
lsProtVal="1"; lsProtVal="1";
...@@ -6750,9 +6875,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6750,9 +6875,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
lsCadreCode=checkNull(genericUtility.getColumnValue("cadre_code", dom)); lsCadreCode=checkNull(genericUtility.getColumnValue("cadre_code", dom));
lsGradeCode=checkNull(genericUtility.getColumnValue("grade_code", dom)); lsGradeCode=checkNull(genericUtility.getColumnValue("grade_code", dom));
//Modified by Poonam B on 12/07/2019[END].To add checkNull method //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[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))
{ {
...@@ -6767,9 +6892,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6767,9 +6892,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{ {
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)
{ {
...@@ -6855,7 +6980,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -6855,7 +6980,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Rohini T on [21/08/19][Start] //Modified by Rohini T on [21/08/19][Start]
//if(retirementVarvalue.equalsIgnoreCase("NULLFOUND") || retirementVarvalue == null || retirementVarvalue.trim().length() == 0) //if(retirementVarvalue.equalsIgnoreCase("NULLFOUND") || retirementVarvalue == null || retirementVarvalue.trim().length() == 0)
if("NULLFOUND".equalsIgnoreCase(retirementVarvalue) || retirementVarvalue == null || retirementVarvalue.trim().length() == 0) if("NULLFOUND".equalsIgnoreCase(retirementVarvalue) || retirementVarvalue == null || retirementVarvalue.trim().length() == 0)
//Modified by Rohini T on [21/08/19][End] //Modified by Rohini T on [21/08/19][End]
{ {
retirementVarvalue=""; retirementVarvalue="";
} }
...@@ -7147,7 +7272,41 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ ...@@ -7147,7 +7272,41 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
throw new ITMException(e); throw new ITMException(e);
} }
return maval1; return maval1;
} }
//Modified by Rohini T on 28/08/19[End] //Modified by Rohini T on 28/08/19[End]
public String getErrorMessage(String message,String messageValue,String errorId, String traceInfo ,String type) throws RemoteException,ITMException
{
System.out.println("getErrorXML..........");
String errString = "";
try
{
errString = "";
StringBuffer valueXmlErrorString = new StringBuffer("<Errors>\r\n ");
valueXmlErrorString.append("<error id=\"").append(errorId).append("\" type=\""+type+"\"").append(" column_name=\"description\"").append(">");
valueXmlErrorString.append("<message><![CDATA[").append(message).append("]]></message>\r\n");
valueXmlErrorString.append("<description><![CDATA[").append(messageValue).append("]]></description>\r\n");
valueXmlErrorString.append("<type>E</type>\r\n");
valueXmlErrorString.append("<option></option>\r\n");
valueXmlErrorString.append("<time></time>\r\n");
valueXmlErrorString.append("<alarm></alarm>\r\n");
valueXmlErrorString.append("<source></source>\r\n");
valueXmlErrorString.append("<trace>Error : "+traceInfo+" </trace>\r\n");
valueXmlErrorString.append("<redirect>1</redirect>\r\n");
valueXmlErrorString.append("</error>\r\n");
valueXmlErrorString.append("</Errors>\r\n");
System.out.println( "\n****valueXmlErrorString :" + valueXmlErrorString.toString() + ":********" );
errString =valueXmlErrorString.toString();
System.out.println("Modified error string"+errString);
}
catch (Exception ex)
{
ex.printStackTrace();
}
return errString;
}
} }
\ 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