Skip to content

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

EmpComplete.java 

EmployeeEJB.java


Changes made for is_alive related changes 
1.If is_alive is Y  then system should set dependent as Y and vise versa


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198958 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 65c0690c
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 3 deletions
webitm-adm/ibase/webitm/ejb/adm/EmpComplete.java
View file @ 3455b73c
......@@ -1496,10 +1496,33 @@ public class EmpComplete extends ValidatorEJB implements EmpCompleteLocal,EmpCo
System.out.println("empCode is :::::"+empCode );
valueXmlString.append("<emp_code>").append("<![CDATA[" + empCode + "]]>").append("</emp_code>");
//Modified by Rohini T on 15/March/2019[A17HSUN005][start]
valueXmlString.append("<is_alive>").append("<![CDATA[Y]]>").append("</is_alive>");
//Modified by Rohini T on 15/March/2019[A17HSUN005][end]
//valueXmlString.append("<operation protect=\"0\"></operation>");
//valueXmlString.append("<exp_lev protect=\"0\"></exp_lev>");
}
//Modified by Rohini T on 15/March/2019[A17HSUN005][start]
if(currentColumn.equalsIgnoreCase("is_alive"))
{
String isAlive = "", dependent = "";
isAlive = genericUtility.getColumnValue("is_alive", dom);
dependent = genericUtility.getColumnValue("dependent", dom);
System.out.println("isAlive:::::"+isAlive +"\t" + "dependent:::::"+dependent);
if("N".equalsIgnoreCase(isAlive))
{
System.out.println("dependent111:::::"+dependent);
valueXmlString.append("<dependent protect='1'><![CDATA[N]]></dependent>\r\n");
}
else
{
System.out.println("dependent222:::::"+dependent);
valueXmlString.append("<dependent protect='0'><![CDATA["+ dependent +"]]></dependent>\r\n");
}
}
//Modified by Rohini T on 15/March/2019[A17HSUN005][end]
valueXmlString.append("</Detail2>");
break;
......
webitm-adm/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ 3455b73c
......@@ -993,6 +993,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
//Modified by Suraj [03/06/2015][To handle null nationality value] [Start]
cnt=0;
nationality=genericUtility.getColumnValue("nationality", dom);
System.out.println("nationality:::::"+nationality);
if(nationality != null && nationality.trim().length() > 0)
{
cnt=isValueExist("country","count_code",nationality, conn);
......@@ -1061,6 +1062,7 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{
System.out.println("In Validation of : ["+childNodeName+"]");
perState=genericUtility.getColumnValue("per_state", dom);
System.out.println("perState::::"+perState);
if(perState != null && perState.trim().length() > 0)
{
cnt=isValueExist("state","state_code",perState, conn);
......@@ -1307,8 +1309,11 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{
joinDate = sdf.parse(dateJoinStr);
}
System.out.println("graDt"+graDt);
System.out.println("joinDate"+joinDate);
if(graDt.before(joinDate))
{
System.out.println("");
errList.add("VTGRADATE");
errFields.add(childNodeName.toLowerCase());
msgType = errorType(conn, "VTGRADATE");
......@@ -2677,7 +2682,10 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<Detail1 domID='1' dbID='' objContext='1' objName='"+objNameDefault+"' selected='Y'>\r\n");
if (currentColumn.equalsIgnoreCase("itm_default"))
{
System.out.println("ItemChange of:::::"+currentColumn);
System.out.println("ItemChange of:::::"+currentColumn);
//Modified by Rohini T on 14/March/2019[A17DSUN006][start]
valueXmlString.append("<revision_no><![CDATA[").append(1).append("]]></revision_no>\r\n");
//Modified by Rohini T on 14/March/2019[A17DSUN006][end]
valueXmlString.append("<citizen>").append("<![CDATA[Y]]>").append("</citizen>");
valueXmlString.append("<training_prd>").append("<![CDATA[0]]>").append("</training_prd>");
valueXmlString.append("<probation_prd>").append("<![CDATA[0]]>").append("</probation_prd>");
......@@ -2706,6 +2714,20 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
{
System.out.println("ItemChange of:::::"+currentColumn);
//Modified by Rohini T on 14/March/2019[A17DSUN006][start]
String revNo = genericUtility.getColumnValue("revision_no", dom);
long revisionNo = 0;
try
{
revisionNo = (revNo != null && revNo.trim().length() > 0) ? Long.parseLong(revNo):0;
}
catch (Exception e)
{
revisionNo = 0;
}
revisionNo = revisionNo + 1;
valueXmlString.append("<revision_no><![CDATA[").append(revisionNo).append("]]></revision_no>\r\n");
//Modified by Rohini T on 14/March/2019[A17DSUN006][end]
reportToAdmin = genericUtility.getColumnValue("report_to__admin", dom);
empClass = genericUtility.getColumnValue("emp_class", dom);
occuCode = genericUtility.getColumnValue("occupation_code", dom);
......@@ -4222,6 +4244,8 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
while(ctr < childNodeListLength && !childNodeName.equals(currentColumn));
valueXmlString.append("<Detail2>\r\n");
System.out.println("Inside case 2");
if (currentColumn.equalsIgnoreCase("itm_default"))
{
System.out.println("ItemChange2 of:::::"+currentColumn);
......@@ -4238,7 +4262,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
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("<pen_nominee protect=\"1\"><![CDATA[N]]></pen_nominee>\r\n");
//Modified by Rohini T on 15/March/2019[A17HSUN005][start]
valueXmlString.append("<is_alive>").append("<![CDATA[Y]]>").append("</is_alive>");
//Modified by Rohini T on 15/March/2019[A17HSUN005][end]
}
if (currentColumn.equalsIgnoreCase("itm_defaultedit"))
{
......@@ -4367,6 +4393,26 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<pen_perc protect=\"1\"><![CDATA[0]]></pen_perc>\r\n");
}
}
//Modified by Rohini T on 15/March/2019[A17HSUN005][start]
if(currentColumn.equalsIgnoreCase("is_alive"))
{
String isAlive = "", dependent = "";
isAlive = genericUtility.getColumnValue("is_alive", dom);
dependent = genericUtility.getColumnValue("dependent", dom);
System.out.println("isAlive:::::"+isAlive +"\t" + "dependent:::::"+dependent);
if("N".equalsIgnoreCase(isAlive))
{
System.out.println("dependent111:::::"+dependent);
valueXmlString.append("<dependent protect='1'><![CDATA[N]]></dependent>\r\n");
}
else
{
System.out.println("dependent222:::::"+dependent);
valueXmlString.append("<dependent protect='0'><![CDATA["+ dependent +"]]></dependent>\r\n");
}
}
//Modified by Rohini T on 15/March/2019[A17HSUN005][end]
valueXmlString.append ("</Detail2>\r\n");
}
break;
......
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