Commit ef6e1acf authored by rzore's avatar rzore

changes made for not showing station type of zero visits in floating dashboard

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182955 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7cfbbd9b
......@@ -662,7 +662,7 @@ public class CalendarDBR extends ValidatorEJB implements CalendarDBRLocal, Calen
queryBuilder.append("and det.prd_code = hdr.prd_code and hdr.prd_code = '"+period+"' union all ");
queryBuilder.append("select distinct sr.station_type as stan_type, trunc(sp.plan_date) as plan_date, 0 as planned_visit,1 as actual_visit from sprs_plan_place spp, sprs_plan_hdr sp, period prd, sprs_route sr ");
queryBuilder.append("where spp.plan_id = sp.plan_id and sr.sprs_code = sp.sprs_code__plan and spp.work_stan_code = sr.stan_code and prd.code = '"+period+"' ");
queryBuilder.append("and sp.plan_date >=prd.fr_date and sp.plan_date<=prd.to_date and sp.sprs_code__plan = '"+loginCode+"') group by stan_type");
queryBuilder.append("and sp.plan_date >=prd.fr_date and sp.plan_date<=prd.to_date and sp.sprs_code__plan = '"+loginCode+"') where planned_visit > 0 group by stan_type"); // added condition of planned visit by rupali on 03/04/18
}
else if("DB2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -672,7 +672,7 @@ public class CalendarDBR extends ValidatorEJB implements CalendarDBRLocal, Calen
queryBuilder.append("and det.prd_code = hdr.prd_code and hdr.prd_code = '"+period+"' union all ");
queryBuilder.append("select distinct sr.station_type as stan_type, date(sp.plan_date) as plan_date, 0 as planned_visit,1 as actual_visit from sprs_plan_place spp, sprs_plan_hdr sp, period prd, sprs_route sr ");
queryBuilder.append("where spp.plan_id = sp.plan_id and sr.sprs_code = sp.sprs_code__plan and spp.work_stan_code = sr.stan_code and prd.code = '"+period+"' ");
queryBuilder.append("and sp.plan_date >=prd.fr_date and sp.plan_date<=prd.to_date and sp.sprs_code__plan = '"+loginCode+"') as caldash group by stan_type");
queryBuilder.append("and sp.plan_date >=prd.fr_date and sp.plan_date<=prd.to_date and sp.sprs_code__plan = '"+loginCode+"') as caldash where planned_visit > 0 group by stan_type"); // added condition of planned visit by rupali on 03/04/18
}
......
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