Index: src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java =================================================================== diff -u -r71cf5d2f75e4b36a8ada431504fd516e728df5f9 -r36e06485cbc32611a5fc3458f6c060ddbf6c80dc --- src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision 71cf5d2f75e4b36a8ada431504fd516e728df5f9) +++ src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision 36e06485cbc32611a5fc3458f6c060ddbf6c80dc) @@ -166,14 +166,14 @@ " and sp_.similar_PRODUCT_ID = ssp_.PRODUCT_ID) sim " + " , (SELECT DISTINCT sp.product_id, sim.similar_product_id," + " SUM( CASE WHEN sim_sp.min_stocking_qty > 0 THEN 1 ELSE 0 END) OVER (PARTITION BY sp.product_id) coverage" + - " FROM site_product sp , similar_product sim, site_product sim_sp" + - " WHERE sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + + " FROM session_site_product sp , similar_product sim, site_product sim_sp" + + " WHERE sp.session_id= "+skuTableWidgetData.getSessionId() + " AND sim_sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + " AND sp.product_id = sim.product_id AND sim.similar_product_id = sim_sp.product_id ) similarproduct "; else if (("coverageRisk").equals(skuTableWidgetData.getSimPartsOption())) sql += " , (SELECT DISTINCT sp.product_id, SUM( CASE WHEN sim_sp.min_stocking_qty > 0 THEN 1 ELSE 0 END) OVER (PARTITION BY sp.product_id) coverage" + - " FROM site_product sp , similar_product sim, site_product sim_sp" + - " WHERE sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + + " FROM session_site_product sp , similar_product sim, site_product sim_sp" + + " WHERE sp.session_id= "+skuTableWidgetData.getSessionId() + " AND sim_sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + " AND sp.product_id = sim.product_id AND sim.similar_product_id = sim_sp.product_id ) similarproduct "; else @@ -799,14 +799,14 @@ " and sp_.similar_PRODUCT_ID = ssp_.PRODUCT_ID) sim " + " , (SELECT DISTINCT sp.product_id, sim.similar_product_id," + " SUM( CASE WHEN sim_sp.min_stocking_qty > 0 THEN 1 ELSE 0 END) OVER (PARTITION BY sp.product_id) coverage" + - " FROM site_product sp , similar_product sim, site_product sim_sp" + - " WHERE sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + + " FROM session_site_product sp , similar_product sim, site_product sim_sp" + + " WHERE sp.session_id= "+skuTableWidgetData.getSessionId() + " AND sim_sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + " AND sp.product_id = sim.product_id AND sim.similar_product_id = sim_sp.product_id ) similarproduct "; else if (("coverageRisk").equals(skuTableWidgetData.getSimPartsOption())) sql += " , (SELECT DISTINCT sp.product_id, SUM( CASE WHEN sim_sp.min_stocking_qty > 0 THEN 1 ELSE 0 END) OVER (PARTITION BY sp.product_id) coverage" + - " FROM site_product sp , similar_product sim, site_product sim_sp" + - " WHERE sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + + " FROM session_site_product sp , similar_product sim, site_product sim_sp" + + " WHERE sp.session_id= "+skuTableWidgetData.getSessionId() + " AND sim_sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + " AND sp.product_id = sim.product_id AND sim.similar_product_id = sim_sp.product_id ) similarproduct "; else @@ -1487,17 +1487,17 @@ sql += " inner join (SELECT DISTINCT sp.product_id, sim.similar_product_id," + " SUM( CASE WHEN sim_sp.min_stocking_qty > 0 THEN 1 ELSE 0 END) OVER (PARTITION BY sp.product_id) coverage" + - " FROM site_product sp , similar_product sim, site_product sim_sp" + - " WHERE sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + + " FROM session_site_product sp , similar_product sim, site_product sim_sp" + + " WHERE sp.session_id= "+skuTableWidgetData.getSessionId() + " AND sim_sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + " AND sp.product_id = sim.product_id AND sim.similar_product_id = sim_sp.product_id ) similarproduct " + " on similarproduct.PRODUCT_ID = ssp.PRODUCT_ID "; sql += " and (similarproduct.coverage > 0 OR sim.order_qty > 0) and (ssp.RECOMMENDED_ORDER_QTY > 0 or ssp.MIN_STOCKING_QTY > 0) "; } else if (("coverageRisk").equals(skuTableWidgetData.getSimPartsOption())) sql += " inner join (SELECT DISTINCT sp.product_id, SUM( CASE WHEN sim_sp.min_stocking_qty > 0 THEN 1 ELSE 0 END) OVER (PARTITION BY sp.product_id) coverage" + - " FROM site_product sp, similar_product sim, site_product sim_sp" + - " WHERE sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + + " FROM session_site_product sp , similar_product sim, site_product sim_sp" + + " WHERE sp.session_id= "+skuTableWidgetData.getSessionId() + " AND sim_sp.site_id IN (SELECT site_id FROM session_site WHERE session_id = " + skuTableWidgetData.getSessionId() + ")" + " AND sp.product_id = sim.product_id AND sim.similar_product_id = sim_sp.product_id ) similarproduct" + " on similarProduct.PRODUCT_ID = ssp.PRODUCT_ID and similarproduct.coverage = 0 and NVL(ssp.MIN_STOCKING_QTY, 0) = 0 "; @@ -5186,6 +5186,7 @@ hubSiteProducts.setCountMinQty ( rowCount.getInt ( 1 ) ); } hubSiteProducts.setNetworkId ( hsnNetworkId ); + hubSiteProducts.setNetworkId ( hsnNetworkId ); hubSiteProducts.setHubSiteId ( hsnSiteId ); hubSiteProductsList.add ( hubSiteProducts ); }