Index: src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java =================================================================== diff -u -r68da96eb21fec8a4994ca7192c8fd3120fd4bbbb -r450968d633d26937f1a671b0484f41d94fd2fdff --- src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision 68da96eb21fec8a4994ca7192c8fd3120fd4bbbb) +++ src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision 450968d633d26937f1a671b0484f41d94fd2fdff) @@ -693,10 +693,17 @@ } //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) { //SalesOccurr 12 Filter @@ -750,6 +757,7 @@ sql += " WHERE RN BETWEEN " +startRowNumber+ " AND " +endRowNumber+ " ORDER BY RN "; long start = System.currentTimeMillis(); skuTableData = jdbcTemplate.queryForList(sql); + System.out.println("Review" +sql); LOGGER.debug("getSKUTableData request for sessionId " + skuTableWidgetData.getSessionId() + " took: " + (System.currentTimeMillis() - start)); return skuTableData; @@ -1203,10 +1211,17 @@ } //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) { //SalesOccurr 12 Filter @@ -1849,10 +1864,17 @@ } //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) { //SalesOccurr 12 Filter @@ -2592,10 +2614,17 @@ } //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) { //SalesOccurr 12 Filter @@ -2936,7 +2965,7 @@ String siteSKUTableDataSQL = "SELECT S.SITE_ID AS \"siteId\", S.SITE_NAME AS \"site\", " + " (S.Address1 || ', ' || S.Address2 || ', ' || S.CITY || ', ' || " + " S.STATE || ', ' || S.Postal_Code || ', ' || S.Country) As \"Address\", " - + " ROUND(ssp.PTS*100) AS \"salesPotential\", " + + " nvl(ROUND(ssp.PTS*100),0) AS \"salesPotential\", " + " CASE WHEN ssp.business_rules_applied = '000' THEN 0 ELSE 1 END as \"businessRulesApplied\", " + " nullif(SSP.SOLD_LAST_12_MONTHS, 0) AS \"sales12\", " @@ -4247,11 +4276,18 @@ sql += " and ssp.ON_HAND>0 and ssp.RECOMMENDED_RETURN_QTY>0 and ssp.MIN_STOCKING_QTY>0 and ssp.INITIAL_STOCKING_DT is not null and ssp.class != 'O' "; } - //SalesPotential Filter PUL-7390 - if (skuTableWidgetData.getPtsMin() != null && skuTableWidgetData.getPtsMax() != null) { - sql += " and ROUND(ssp.PTS*100) >= " + skuTableWidgetData.getPtsMin() + " and round(ssp.PTS*100) <= " + skuTableWidgetData.getPtsMax(); - } + //SalesPotential Filter + if(skuTableWidgetData.getPtsMin() != null || skuTableWidgetData.getPtsMax() != null){ + 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(); + }} + + //DCR_PTS Filter if (skuTableWidgetData.getDcrPtsMin() != null && skuTableWidgetData.getDcrPtsMax() != null) { sql += " and ssp.DCR_PTS >= " + skuTableWidgetData.getDcrPtsMin() + " and ssp.DCR_PTS <= " + skuTableWidgetData.getDcrPtsMax(); 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 ) {