Skip to content

B
business-java
Commit c0684544 authored by pbhosale's avatar pbhosale
Browse files
Options

Updated on [18-02-2020] changes done to display pos_code descr 

EmployeeEJB.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216790 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fb210321
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 13 deletions
webitm-adm/src/ibase/webitm/ejb/adm/EmployeeEJB.java
View file @ c0684544
......@@ -5439,13 +5439,30 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
empCode = checkNull(genericUtility.getColumnValue("emp_code", dom));
deptCode = checkNull(genericUtility.getColumnValue("dept_code", dom));
posCode = checkNull(genericUtility.getColumnValue("pos_code", dom));
gradeCode = checkNull(genericUtility.getColumnValue("grade_code", dom));
//empCode = genericUtility.getColumnValue("emp_code", dom);
//deptCode = genericUtility.getColumnValue("dept_code", dom);
//posCode = genericUtility.getColumnValue("pos_code", dom);
// Modified by Yashwant on 26/06/2019.End
if(posCode != null && posCode.trim().length() > 0)
{
String sqlPc = "SELECT fn_get_pos_descr(?,?,?) AS POS_DESCR FROM DUAL";
//Modified by Poonam B[18-02-2020][START][Changed as per Nvo]
String sqlPc = "SELECT fn_get_pos_descr4(?,?,?,?) AS POS_DESCR FROM DUAL";
pstmt = connection.prepareStatement(sqlPc);
pstmt.setString(1, empCode);
pstmt.setString(2, deptCode);
pstmt.setString(3, posCode);
pstmt.setString(4, gradeCode);
rs = pstmt.executeQuery();
if(rs.next())
{
descr = rs.getString("POS_DESCR");
System.out.println("descr of POS_DESCR4::::" +descr);
}
else
{
close(pstmt, rs);
sqlPc = "SELECT fn_get_pos_descr(?,?,?) AS POS_DESCR FROM DUAL";
pstmt = connection.prepareStatement(sqlPc);
pstmt.setString(1, empCode);
pstmt.setString(2, deptCode);
......@@ -5454,9 +5471,12 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
while(rs.next())
{
descr = rs.getString("POS_DESCR");
System.out.println("descr of POS_DESCR::::" +descr);
System.out.println("descr of POS_DESCR3::::" +descr);
}
}
close(pstmt, rs);
}
//Modified by Poonam B[18-02-2020][END][Changed as per Nvo]
if(descr != null && descr.trim().length() > 0)
{
valueXmlString.append("<pos_code_descr>").append("<![CDATA[").append(descr).append( "]]>").append("</pos_code_descr>");
......@@ -5466,11 +5486,6 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
valueXmlString.append("<pos_code_descr>").append("<![CDATA[]]>").append("</pos_code_descr>");
}
}
else
{
valueXmlString.append("<pos_code_descr>").append("<![CDATA[]]>").append("</pos_code_descr>");
}
}
else if(currentColumn.trim().equalsIgnoreCase("driv_lic_no"))
{
System.out.println("ItemChange of:::::"+currentColumn);
......@@ -5901,14 +5916,20 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
gratNominee =checkNull( genericUtility.getColumnValue("grat_nominee", dom));
pfNominee =checkNull(genericUtility.getColumnValue("pf_nominee", dom));
penNominee =checkNull(genericUtility.getColumnValue("pen_nominee", dom));
//
//Modified By Poonam B[13-02-2020][Start][To append percentage in edit mode]
gratPerc = checkNull(genericUtility.getColumnValue("grat_perc", dom));
pfPerc = checkNull(genericUtility.getColumnValue("pf_perc", dom));
penPerc = checkNull(genericUtility.getColumnValue("pen_perc", dom));
//Modified By Poonam B[13-02-2020][End][To append percentage in edit mode]
if(gratNominee == null || gratNominee.trim().length() == 0 || gratNominee.trim().equals("N"))
{
valueXmlString.append("<grat_perc protect=\"1\"><![CDATA[]]></grat_perc>\r\n");
}
else
{
valueXmlString.append("<grat_perc protect=\"0\"><![CDATA[]]></grat_perc>\r\n");
//Modified By Poonam B[13-02-2020][Start][To append percentage in edit mode]
valueXmlString.append("<grat_perc protect=\"0\"><![CDATA["+gratPerc+"]]></grat_perc>\r\n");
//Modified By Poonam B[13-02-2020][End][To append percentage in edit mode]
}
if(pfNominee == null || pfNominee.trim().length() == 0 || pfNominee.trim().equals("N"))
{
......@@ -5916,7 +5937,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
else
{
valueXmlString.append("<pf_perc protect=\"0\"><![CDATA[]]></pf_perc>\r\n");
//Modified By Poonam B[13-02-2020][Start][To append percentage in edit mode]
valueXmlString.append("<pf_perc protect=\"0\"><![CDATA["+pfPerc+"]]></pf_perc>\r\n");
//Modified By Poonam B[13-02-2020][End][To append percentage in edit mode]
}
if(penNominee == null || penNominee.trim().length() == 0 || penNominee.trim().equals("N"))
{
......@@ -5924,7 +5947,9 @@ public class EmployeeEJB extends ValidatorEJB implements EmployeeEJBLocal,Employ
}
else
{
valueXmlString.append("<pen_perc protect=\"0\"><![CDATA[]]></pen_perc>\r\n");
//Modified By Poonam B[13-02-2020][Start][To append percentage in edit mode]
valueXmlString.append("<pen_perc protect=\"0\"><![CDATA["+penPerc+"]]></pen_perc>\r\n");
//Modified By Poonam B[13-02-2020][End][To append percentage in edit mode]
}
}
......
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