Index: src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java =================================================================== diff -u -rf9a91382cb8475c83ae4815b3e3a839ffbe74235 -r450968d633d26937f1a671b0484f41d94fd2fdff --- src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java (.../ExportServiceImpl.java) (revision f9a91382cb8475c83ae4815b3e3a839ffbe74235) +++ src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java (.../ExportServiceImpl.java) (revision 450968d633d26937f1a671b0484f41d94fd2fdff) @@ -1175,7 +1175,7 @@ " P.FIELD_ABBR as \"sku\"," + " P.PART_NUMBER as \"part\"," + "PRODUCT_DESC as \"description\"," + "P.TOP_APP as \"topApp\"," + - "(ROUND(ssp.PTS*100)) as \"salesPotential\" , " + + "nvl((ROUND(ssp.PTS*100)),0) as \"salesPotential\" , " + "ssp.Effective_PTS as \"EPTS\","+ "(ROUND(ssp.DCR_PTS,2)) AS \"dcrPts\"," + "P.avg_age as \"avgAge\"," + @@ -1713,9 +1713,14 @@ } //SalesPotential Filter - if (skuTableWidgetData.getPtsMin() != null && skuTableWidgetData.getPtsMax() != null) { - sql += " and ROUND(ssp.PTS*100) >= " + skuTableWidgetData.getPtsMin() + " and round(ssp.PTS*100) <= " + skuTableWidgetData.getPtsMax(); - } + if(user.getAccessItemIds().contains(128)){ + if (skuTableWidgetData.getPtsMin() != null && skuTableWidgetData.getPtsMax() != null && skuTableWidgetData.getPtsMax() >= skuTableWidgetData.getPtsMin()) { + sql += " and nvl(ROUND(ssp.PTS*100),0) >= " + skuTableWidgetData.getPtsMin() + " and nvl(round(ssp.PTS*100),0) <= " + skuTableWidgetData.getPtsMax(); + }else if (skuTableWidgetData.getPtsMax() !=null && skuTableWidgetData.getPtsMin() ==null){ + sql +="and ROUND(nvl(ssp.PTS,0) * 100) <=" + skuTableWidgetData.getPtsMax(); + }else if (skuTableWidgetData.getPtsMin() !=null && skuTableWidgetData.getPtsMax() ==null){ + sql +="and ROUND(nvl(ssp.PTS,0) * 100) >=" +skuTableWidgetData.getPtsMin(); + }} //SalesOccurr Filter if (skuTableWidgetData.getSalesOccurrMonth() != null) { @@ -1908,9 +1913,14 @@ } //SalesPotential Filter + if(user.getAccessItemIds().contains(128)){ if (skuTableWidgetData.getPtsMin() != null && skuTableWidgetData.getPtsMax() != null) { activeFilters.add("Sales Potential = " + skuTableWidgetData.getPtsMin() + " to " + skuTableWidgetData.getPtsMax()); - } + }else if (skuTableWidgetData.getPtsMin() != null && skuTableWidgetData.getPtsMax() == null){ + activeFilters.add("Sales Potential = " +skuTableWidgetData.getPtsMin() + "to ..."); + }else if (skuTableWidgetData.getPtsMin() == null && skuTableWidgetData.getPtsMax() !=null){ + activeFilters.add("Sales Potential = " + "...to" +skuTableWidgetData.getPtsMax()); + }} //minHubCountSites if (skuTableWidgetData.getHubSiteCountMin() != null && skuTableWidgetData.getHubSiteCountMax() != null ) {