Index: src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java =================================================================== diff -u -rdab2aac3f1e86b3ea9d4da2e1452ff75718eaa04 -r8986eb7a4926bada39ac722b03bc97c0c43b296b --- src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision dab2aac3f1e86b3ea9d4da2e1452ff75718eaa04) +++ src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision 8986eb7a4926bada39ac722b03bc97c0c43b296b) @@ -496,11 +496,11 @@ } else if (skuTableWidgetData.getDcWideSalesMax() != null && skuTableWidgetData.getDcWideSalesMin() == null) { sql += "and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = dcSite.dc_id " + - " and sp.SALES_LAST_12_MONTHS <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; + " and nvl(sp.SALES_LAST_12_MONTHS,0) <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; } else if (skuTableWidgetData.getDcWideSalesMin() != null && skuTableWidgetData.getDcWideSalesMax() == null) { sql +="and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = dcSite.dc_id " + - " and sp.SALES_LAST_12_MONTHS >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; + " and nvl(sp.SALES_LAST_12_MONTHS,0) >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; } } @@ -512,14 +512,14 @@ "AND "+ skuTableWidgetData.getDcWideSalesMax() +" )"; } else if (skuTableWidgetData.getDcWideSalesMax() != null && skuTableWidgetData.getDcWideSalesMin() == null) { sql += "and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = dcSite.dc_id " + - " and sp.SALES_LAST_24_MONTHS <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; + " and nvl(sp.SALES_LAST_24_MONTHS,0) <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; } else if (skuTableWidgetData.getDcWideSalesMin() != null && skuTableWidgetData.getDcWideSalesMax() == null) { sql +="and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = dcSite.dc_id " + - " and sp.SALES_LAST_24_MONTHS >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; + " and nvl(sp.SALES_LAST_24_MONTHS ,0) >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; } } @@ -969,13 +969,13 @@ sql += "and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = " + " (select s.site_id from site s where s.site_type_code='DC' " + " and s.product_availability_id= (select product_availability_id from site where site_id=ssp.site_id))" + - " and sp.SALES_LAST_12_MONTHS <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; + " and nvl(sp.SALES_LAST_12_MONTHS ,0) <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; } else if (skuTableWidgetData.getDcWideSalesMin() != null && skuTableWidgetData.getDcWideSalesMax() == null) { sql +="and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = " + " (select s.site_id from site s where s.site_type_code='DC' " + " and s.product_availability_id= (select product_availability_id from site where site_id=ssp.site_id))" + - " and sp.SALES_LAST_12_MONTHS >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; + " and nvl(sp.SALES_LAST_12_MONTHS,0) >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; } } @@ -991,7 +991,7 @@ sql += "and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = " + " (select s.site_id from site s where s.site_type_code='DC' " + " and s.product_availability_id= (select product_availability_id from site where site_id=ssp.site_id))" + - " and sp.SALES_LAST_24_MONTHS <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; + " and nvl(sp.SALES_LAST_24_MONTHS,0) <= "+skuTableWidgetData.getDcWideSalesMax() +" )"; @@ -1000,7 +1000,7 @@ sql +="and ssp.product_id in (Select sp.product_id from STORE_SALES_ROLLUP_NEW sp where sp.dc_site_id = " + " (select s.site_id from site s where s.site_type_code='DC' " + " and s.product_availability_id= (select product_availability_id from site where site_id=ssp.site_id))" + - " and sp.SALES_LAST_24_MONTHS >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; + " and nvl(sp.SALES_LAST_24_MONTHS,0) >= " + skuTableWidgetData.getDcWideSalesMin()+" )"; } } @@ -1223,13 +1223,15 @@ sql += " and ssp.site_id in (" + String.join(",", Arrays.asList(skuTableWidgetData.getSiteIdsArray()) .stream().map(Object::toString).collect(Collectors.toList())) + ") "; } +// System.out.println("count of revire" +sql); long start = System.currentTimeMillis(); List> productIds; productIds = jdbcTemplate.queryForList(sql); + LOGGER.debug("getSKUTableDataCount request for sessionId " + skuTableWidgetData.getSessionId() + " took: " + (System.currentTimeMillis() - start)); @@ -2906,6 +2908,8 @@ + " WHERE ssp.product_id = :productId "; } +// System.out.println ("site sku details " + siteSKUTableDataSQL); + NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); MapSqlParameterSource parameters = new MapSqlParameterSource(); if (remainingSites.size() > 0) {