Commit 79cc4379 authored by sbade's avatar sbade

bug fixed for multiple task selection in filter for all job id wise methods.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100303 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dec940c4
...@@ -1734,6 +1734,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f ...@@ -1734,6 +1734,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
/*Added by swati for mltiple usage intensity date 09 Feb 2016*/ /*Added by swati for mltiple usage intensity date 09 Feb 2016*/
if((usageIntensity != null) && (usageIntensity.trim().length() > 0)) if((usageIntensity != null) && (usageIntensity.trim().length() > 0))
{ {
System.out.println("usage intensityin getOHDistributionDetailServlet :"+usageIntensity);
if(usageIntensity.trim().equalsIgnoreCase("0")) if(usageIntensity.trim().equalsIgnoreCase("0"))
{ {
usgIntStr = " and USERS.usage_intensity in ('0') "; usgIntStr = " and USERS.usage_intensity in ('0') ";
...@@ -2090,7 +2091,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f ...@@ -2090,7 +2091,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
if(i==0) if(i==0)
empTask="W_"+(tempArr[i]).toUpperCase(); empTask="W_"+(tempArr[i]).toUpperCase();
else else
empTask=",W_"+(tempArr[i]).toUpperCase(); empTask=empTask+",W_"+(tempArr[i]).toUpperCase();
} }
} }
else if(empTask.indexOf("[")!=-1 ) else if(empTask.indexOf("[")!=-1 )
...@@ -2290,7 +2291,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f ...@@ -2290,7 +2291,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
if(i==0) if(i==0)
empTask="W_"+(tempArr[i]).toUpperCase(); empTask="W_"+(tempArr[i]).toUpperCase();
else else
empTask=",W_"+(tempArr[i]).toUpperCase(); empTask=empTask+",W_"+(tempArr[i]).toUpperCase();
} }
} }
else if(empTask.indexOf("[")!=-1 ) else if(empTask.indexOf("[")!=-1 )
...@@ -2315,6 +2316,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f ...@@ -2315,6 +2316,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
/*Added by swati for mltiple usage intensity date 09 Feb 2016*/ /*Added by swati for mltiple usage intensity date 09 Feb 2016*/
if((usageIntensity != null) && (usageIntensity.trim().length() > 0)) if((usageIntensity != null) && (usageIntensity.trim().length() > 0))
{ {
System.out.println("usageIntensity in date wise : "+usageIntensity);
if(usageIntensity.trim().equalsIgnoreCase("0")) if(usageIntensity.trim().equalsIgnoreCase("0"))
{ {
usgIntStr = " and USERS.usage_intensity in ('0') "; usgIntStr = " and USERS.usage_intensity in ('0') ";
...@@ -2493,7 +2495,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f ...@@ -2493,7 +2495,7 @@ public JSONObject getTopEfficiencyAnalysisServlet(String dataSourceName,String f
if(i==0) if(i==0)
empTask="W_"+(tempArr[i]).toUpperCase(); empTask="W_"+(tempArr[i]).toUpperCase();
else else
empTask=",W_"+(tempArr[i]).toUpperCase(); empTask=empTask+",W_"+(tempArr[i]).toUpperCase();
} }
} }
else if(empTask.indexOf("[")!=-1 ) else if(empTask.indexOf("[")!=-1 )
...@@ -4737,6 +4739,7 @@ public JSONObject getTaskWiseJobIdWiseTimeServlet(String dataSourceName,String f ...@@ -4737,6 +4739,7 @@ public JSONObject getTaskWiseJobIdWiseTimeServlet(String dataSourceName,String f
/*Added by swati for mltiple usage intensity date 09 Feb 2016*/ /*Added by swati for mltiple usage intensity date 09 Feb 2016*/
if((usageIntensity != null) && (usageIntensity.trim().length() > 0)) if((usageIntensity != null) && (usageIntensity.trim().length() > 0))
{ {
System.out.println("usage intensityin getJobWiseDistributionServlet :"+usageIntensity);
if(usageIntensity.trim().equalsIgnoreCase("0")) if(usageIntensity.trim().equalsIgnoreCase("0"))
{ {
usgIntStr = " and USERS.usage_intensity in ('0') "; usgIntStr = " and USERS.usage_intensity in ('0') ";
......
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