Commit eaaa1d1f authored by arawankar's avatar arawankar

Updated Employee separation related component,Changes made to show employee long name

- Changes made in below component
EmpSeparationEJB.java
emp_separation11.xml
emp_separation21.xml
d_emp_separation_brow.srd
d_emp_separation_edit.srd


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189181 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 239f4ed2
...@@ -290,7 +290,8 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe ...@@ -290,7 +290,8 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
} }
errorCode = ""; errorCode = "";
if (editFlag.equalsIgnoreCase("A")) //if (editFlag.equalsIgnoreCase("A"))
if ("A".equalsIgnoreCase(editFlag))
{ {
System.out.println("Inside editFlg of emp_code"); System.out.println("Inside editFlg of emp_code");
int count = 0; int count = 0;
...@@ -619,6 +620,11 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe ...@@ -619,6 +620,11 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
String sepMode = "" ,sepModeDescr = ""; String sepMode = "" ,sepModeDescr = "";
String empCode = ""; String empCode = "";
String fname = "" , lname = ""; String fname = "" , lname = "";
//Modified by Anjali R. on [26/07/2018][Start]
String fnameLong = "" , lnameLong = "";
//Modified by Anjali R. on [26/07/2018][End]
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
...@@ -702,7 +708,10 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe ...@@ -702,7 +708,10 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
empCode = genericUtility.getColumnValue ("emp_code",dom); empCode = genericUtility.getColumnValue ("emp_code",dom);
resigDateStr = genericUtility.getColumnValue ("resi_date",dom); resigDateStr = genericUtility.getColumnValue ("resi_date",dom);
sql = "SELECT EMP_LNAME, EMP_FNAME , NOTICE_PRD FROM EMPLOYEE WHERE EMP_CODE = ?"; //Modified by Anjali R. on[25/07/2018][Start]
//sql = "SELECT EMP_LNAME, EMP_FNAME , NOTICE_PRD FROM EMPLOYEE WHERE EMP_CODE = ?";
sql = "SELECT EMP_LNAME, EMP_FNAME ,EMP_LNAME_LONG, EMP_FNAME_LONG , NOTICE_PRD FROM EMPLOYEE WHERE EMP_CODE = ?";
//Modified by Anjali R. on[25/07/2018][End]
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, empCode); pstmt.setString(1, empCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -710,6 +719,10 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe ...@@ -710,6 +719,10 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
{ {
lname = checkNull(rs.getString("EMP_LNAME")); lname = checkNull(rs.getString("EMP_LNAME"));
fname = checkNull(rs.getString("EMP_FNAME")); fname = checkNull(rs.getString("EMP_FNAME"));
//Modified by Anjali R. on[25/07/2018][Start]
fnameLong = checkNull(rs.getString("EMP_FNAME_LONG"));
lnameLong = checkNull(rs.getString("EMP_LNAME_LONG"));
//Modified by Anjali R. on[25/07/2018][End]
noticePrd = rs.getInt("NOTICE_PRD"); noticePrd = rs.getInt("NOTICE_PRD");
} }
close(pstmt , rs); close(pstmt , rs);
...@@ -723,6 +736,10 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe ...@@ -723,6 +736,10 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
{ {
valueXmlString.append("<emp_lname>").append("<![CDATA[" + lname + "]]>").append("</emp_lname>"); valueXmlString.append("<emp_lname>").append("<![CDATA[" + lname + "]]>").append("</emp_lname>");
valueXmlString.append("<emp_fname>").append("<![CDATA[" + fname + "]]>").append("</emp_fname>"); valueXmlString.append("<emp_fname>").append("<![CDATA[" + fname + "]]>").append("</emp_fname>");
//Modified by Anjali R. on[25/07/2018][Start]
valueXmlString.append("<emp_lname_long>").append("<![CDATA[" + lnameLong + "]]>").append("</emp_lname_long>");
valueXmlString.append("<emp_fname_long>").append("<![CDATA[" + fnameLong + "]]>").append("</emp_fname_long>");
//Modified by Anjali R. on[25/07/2018][End]
valueXmlString.append("<notice_prd>").append("<![CDATA[" + noticePrd + "]]>").append("</notice_prd>"); valueXmlString.append("<notice_prd>").append("<![CDATA[" + noticePrd + "]]>").append("</notice_prd>");
System.out.println("resigDateStr in empCode is" + resigDateStr ); System.out.println("resigDateStr in empCode is" + resigDateStr );
...@@ -736,6 +753,8 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe ...@@ -736,6 +753,8 @@ public class EmpSeparationEJB extends ValidatorEJB implements EmpSeparationEJBRe
valueXmlString.append("<relieve_date>").append("<![CDATA[]]>").append("</relieve_date>"); valueXmlString.append("<relieve_date>").append("<![CDATA[]]>").append("</relieve_date>");
valueXmlString.append("<emp_lname>").append("<![CDATA[]]>").append("</emp_lname>"); valueXmlString.append("<emp_lname>").append("<![CDATA[]]>").append("</emp_lname>");
valueXmlString.append("<emp_fname>").append("<![CDATA[]]>").append("</emp_fname>"); valueXmlString.append("<emp_fname>").append("<![CDATA[]]>").append("</emp_fname>");
valueXmlString.append("<emp_lname_long>").append("<![CDATA[" + lnameLong + "]]>").append("</emp_lname_long>");
valueXmlString.append("<emp_fname_long>").append("<![CDATA[" + fnameLong + "]]>").append("</emp_fname_long>");
valueXmlString.append("<notice_prd>").append("<![CDATA[]]>").append("</notice_prd>"); valueXmlString.append("<notice_prd>").append("<![CDATA[]]>").append("</notice_prd>");
} }
......
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