Commit 5c12a1fc authored by sanashaikh's avatar sanashaikh

Sana S: Modified on 14/01/2020

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215100 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 83cbd8d3
...@@ -297,7 +297,10 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -297,7 +297,10 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
if (rs.next()) if (rs.next())
{ {
ls_accfilt = rs.getString("ls_accfilt"); //Modified by Sana S on 14/01/2020 [start]
//ls_accfilt = rs.getString("ls_accfilt");
ls_accfilt = checkNull(rs.getString("ls_accfilt"));
//Modified by Sana S on 14/01/2020 [end]
} }
if (rs != null) if (rs != null)
{ {
...@@ -310,7 +313,10 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -310,7 +313,10 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
pstmt = null; pstmt = null;
} }
System.out.print("ls_accfilt:"+ls_accfilt); System.out.print("ls_accfilt:"+ls_accfilt);
if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Sana S on 14/01/2020 [start]
if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0)
//if(ls_accfilt != null && ls_accfilt.trim().length() > 0)
//Modified by Sana S on 14/01/2020 [end]
{ {
System.out.print("U R IN"); System.out.print("U R IN");
sql="select count(1) as cnt from allwdedn where ad_code = ? and " + ls_accfilt; sql="select count(1) as cnt from allwdedn where ad_code = ? and " + ls_accfilt;
...@@ -677,6 +683,10 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -677,6 +683,10 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
String nextProcDate1=null; String nextProcDate1=null;
UtilMethods utilMethods=new UtilMethods(); UtilMethods utilMethods=new UtilMethods();
//Added by Sana S on 14/01/2020 [start]
String amount="";
//Added by Sana S on 14/01/2020 [end]
try try
{ {
//SimpleDateFormat sdf=new SimpleDateFormat("dd/MM/yy"); //SimpleDateFormat sdf=new SimpleDateFormat("dd/MM/yy");
...@@ -788,6 +798,22 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk ...@@ -788,6 +798,22 @@ public class EmployeeWisePerkIC extends ValidatorEJB implements EmployeeWisePerk
valueXmlString.append("<allwdedn_descr ><![CDATA[").append(descr).append("]]></allwdedn_descr>\r\n"); valueXmlString.append("<allwdedn_descr ><![CDATA[").append(descr).append("]]></allwdedn_descr>\r\n");
AdmCommon.setNodeValue(dom, "allwdedn_descr", descr); AdmCommon.setNodeValue(dom, "allwdedn_descr", descr);
} }
//Added by Sana S on 14/01/2020 [start]
else if ("amount".equalsIgnoreCase(currentColumn))
{
amount=checkNull(genericUtility.getColumnValue("amount", dom));
System.out.print("Amount:::"+amount);
if(amount.equals("") || amount.length() == 0 || amount.equals(null))
{
valueXmlString.append("<amount><![CDATA[").append("0").append("]]></amount>\r\n");
System.out.print("Amount1:::"+amount);
}
}
//Added by Sana S on 14/01/2020 [end]
else if ("last_proc_for".equalsIgnoreCase(currentColumn)) else if ("last_proc_for".equalsIgnoreCase(currentColumn))
{ {
lastProcFor=""; lastProcFor="";
......
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