AllowDednSalComp.java -

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

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

@@ -197,11 +197,22 @@ public class AllowDednSalComp
 					System.out.println("strBaseFormula::::inside getAdCompInfo after"+strBaseFormula);
 				}
 				*/
-				if(strBaseFormula != null && strBaseFormula.trim().length() > 0 && !strBaseFormula.startsWith("SELECT "))
+				//Added by Varsha V on 28-11-19
+				/*if(strBaseFormula != null && strBaseFormula.trim().length() > 0 && !strBaseFormula.startsWith("SELECT "))
 				{
 					strBaseFormula = convertFormulaInJava(strBaseFormula.trim().toUpperCase(),conn);
 					System.out.println("strBaseFormula::::inside getAdCompInfo after"+strBaseFormula);
+				}*/
+				if(strBaseFormula != null && strBaseFormula.trim().length() > 0)
+				{
+					strBaseFormula = strBaseFormula.trim().toUpperCase();
+					if (!strBaseFormula.startsWith("SELECT "))
+					{
+						strBaseFormula = convertFormulaInJava(strBaseFormula,conn);
+						System.out.println("strBaseFormula::::inside getAdCompInfo after"+strBaseFormula);
 					}
+				}
+				//Ended by Varsha V on 28-11-19
 				//Modified By Poonam B[20/11/2019][method name is renamed and replace in other select statement].End
 				//Ended By Varsha V on 19-07-19 to replace IF with IIF
 
@@ -216,11 +227,22 @@ public class AllowDednSalComp
 					System.out.println("strSlabFormula::::inside getAdCompInfo after"+strSlabFormula);
 				}
 				*/
-				if(strSlabFormula != null && strSlabFormula.trim().length() > 0 && !strSlabFormula.startsWith("SELECT "))
+				//Added by Varsha V on 28-11-19
+				/*if(strSlabFormula != null && strSlabFormula.trim().length() > 0 && !strSlabFormula.startsWith("SELECT "))
 				{
 					strSlabFormula = convertFormulaInJava(strSlabFormula.trim().toUpperCase(),conn);
 					System.out.println("strSlabFormula::::inside getAdCompInfo after"+strSlabFormula);
+				}*/
+				if(strSlabFormula != null && strSlabFormula.trim().length() > 0)
+				{
+					strSlabFormula = strSlabFormula.trim().toUpperCase();
+					if (!strSlabFormula.startsWith("SELECT "))
+					{
+						strSlabFormula = convertFormulaInJava(strSlabFormula,conn);
+						System.out.println("strSlabFormula::::inside getAdCompInfo after"+strSlabFormula);
+					}
 				}
+				//Ended by Varsha V on 28-11-19
 				//Modified By Poonam B[20/11/2019][method name is renamed and replace in other select statement].End
 				//Ended By Varsha V on 19-07-19 to replace IF with IIF
 
@@ -235,11 +257,22 @@ public class AllowDednSalComp
 					System.out.println("strResFormula::::inside getAdCompInfo after"+strResFormula);
 				}
 				*/
-				if(strResFormula != null && strResFormula.trim().length() > 0 && ! strResFormula.startsWith("SELECT "))
+				//Added by Varsha V on 28-11-19
+				/*if(strResFormula != null && strResFormula.trim().length() > 0 && ! strResFormula.startsWith("SELECT "))
 				{
 					strResFormula = convertFormulaInJava(strResFormula.trim().toUpperCase(),conn);
 					System.out.println("strResFormula::::inside getAdCompInfo after"+strResFormula);
+				}*/
+				if(strResFormula != null && strResFormula.trim().length() > 0)
+				{
+					strResFormula = strResFormula.trim().toUpperCase();
+					if (!strResFormula.startsWith("SELECT "))
+					{
+						strResFormula = convertFormulaInJava(strResFormula,conn);
+						System.out.println("strResFormula::::inside getAdCompInfo after"+strResFormula);
+					}
 				}
+				//Ended by Varsha V on 28-11-19
 				//Modified By Poonam B[20/11/2019][method name is renamed and replace in other select statement].End
 				//Ended By Varsha V on 19-07-19 to replace IF with IIF
 
@@ -293,9 +326,12 @@ public class AllowDednSalComp
 				adCompMap.put("PAYABLE" , checkNull(strPayable));
 				adCompMap.put("POST_YN" , checkNull(strPostYn));
 				adCompMap.put("SLAB_OPTION" , checkNull(strSlabOption));
-				adCompMap.put("BASE_FORMULA" , checkNull(strBaseFormula).trim().toUpperCase());
-				adCompMap.put("SLAB_FORMULA" , checkNull(strSlabFormula).trim().toUpperCase());
-				adCompMap.put("RES_FORMULA" , checkNull(strResFormula).trim().toUpperCase());
+				//adCompMap.put("BASE_FORMULA" , checkNull(strBaseFormula).trim().toUpperCase());
+				adCompMap.put("BASE_FORMULA" , strBaseFormula);
+				//adCompMap.put("SLAB_FORMULA" , checkNull(strSlabFormula).trim().toUpperCase());
+				adCompMap.put("SLAB_FORMULA" , strSlabFormula);
+				//adCompMap.put("RES_FORMULA" , checkNull(strResFormula).trim().toUpperCase());
+				adCompMap.put("RES_FORMULA" , strResFormula);
 				adCompMap.put("BAL_OPT" , checkNull(strBalOpt));
 				adCompMap.put("FOR_CONDN" , checkNull(strForCondn));
 				adCompMap.put("SQL_EXPR" , checkNull(strSqlExpr));