Sana S: Modified on 14/01/2020

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215099 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/src/ibase/webitm/ejb/adm/CadreWisePerkIC.java

@@ -304,7 +304,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 
 								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)
 								{
@@ -317,8 +320,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 									pstmt = null;
 								}
 								System.out.print("ls_accfilt:"+ls_accfilt);
-								//if(!ls_accfilt.equals("") && ls_accfilt.trim().length() > 0)
-								if(ls_accfilt != null && ls_accfilt.trim().length() > 0) //Modified by Shital on 13/01/2020
+								//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 Shital on 13/01/2020
+									//Modified by Sana S on 14/01/2020 [end]
 								{
 									System.out.print("U R IN");
 									sql="select count(1) from allwdedn where ad_code = ?  and " + ls_accfilt;
@@ -661,6 +666,10 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 
 		SimpleDateFormat sdf;
 
+		//Added by Sana S on 14/01/2020 [start]
+		String amount="";
+		//Added by Sana S on 14/01/2020 [end]
+
 		try
 		{
 
@@ -759,6 +768,19 @@ public class CadreWisePerkIC extends ValidatorEJB implements CadreWisePerkLocal,
 					valueXmlString.append("<allwdedn_descr ><![CDATA[").append(descr).append("]]></allwdedn_descr>\r\n");
 					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("Amount:::"+amount);
+					}
+				}
+				//Added by Sana S on 14/01/2020 [end]
 				else if ("last_proc_for".equalsIgnoreCase(currentColumn)) 
 				{
 					lastProcFor=checkNull(genericUtility.getColumnValue("last_proc_for", dom));