Index: src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java =================================================================== diff -u -r68da96eb21fec8a4994ca7192c8fd3120fd4bbbb -rf7bcb82c939ec7f212ac95c6f15b5c865730f916 --- 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 f7bcb82c939ec7f212ac95c6f15b5c865730f916) @@ -244,8 +244,34 @@ + "and ssp.SITE_ID=sp.SITE_ID and SSP.LEVEL4_PARENT_ID=sp.HIERARCHY_ID and sp.SITE_ID=s.SITE_ID " + " and (ssp.effective_pts = 230 and ssp.RECOMMENDED_ORDER_QTY > 0) "; } + //dcSales Filter + if(skuTableWidgetData.getDcSalesMonth() != null ) { + //dcSales 12 Filter + if (skuTableWidgetData.getDcSalesMonth() == 12) { + sql += "and ssp.dc_sales_last_12_months "; + if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMax() >= skuTableWidgetData.getDcSalesMin()) { + sql += " between " + skuTableWidgetData.getDcSalesMin() + " and " + skuTableWidgetData.getDcSalesMax() ; + } else if (skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMin() == null) { + sql += " <= " + skuTableWidgetData.getDcSalesMax(); + } else if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() == null) { + sql += " >= " + skuTableWidgetData.getDcSalesMin(); + } + } + //DcSales 24 Filter + if (skuTableWidgetData.getDcSalesMonth() == 24) { + sql += "and ssp.dc_sales_last_24_months "; + if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMax() >= skuTableWidgetData.getDcSalesMin()) { + sql += " between " + skuTableWidgetData.getDcSalesMin() + " and " + skuTableWidgetData.getDcSalesMax() ; + } else if (skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMin() == null) { + sql += " <= " + skuTableWidgetData.getDcSalesMax(); + } else if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() == null) { + sql += " >= " + skuTableWidgetData.getDcSalesMin(); + } + } + } + //PUL-7923 Stocked and Non Stocked if (skuTableWidgetData.isDcStocking() && ("stockedatdc").equals(skuTableWidgetData.getSelectedStockNonStockOption().trim())) { sql += " and (ssp.product_id = dc_sp.product_id(+) AND NVL(dc_sp.max_stocking_qty, 0) > 0 ) "; @@ -424,6 +450,7 @@ } + // New Parts filter if (skuTableWidgetData.isProspectParts()) { sql += " and ((ssp.FORECAST_MODEL_ID IN (0,200, 20000) AND ssp.RECOMMENDED_ORDER_QTY > 0) " Index: src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java =================================================================== diff -u -r02411019c7a80cb91383e65fec0baf73fce9ce71 -rf7bcb82c939ec7f212ac95c6f15b5c865730f916 --- src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java (.../SessionServiceImpl.java) (revision 02411019c7a80cb91383e65fec0baf73fce9ce71) +++ src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java (.../SessionServiceImpl.java) (revision f7bcb82c939ec7f212ac95c6f15b5c865730f916) @@ -347,9 +347,9 @@ * java.lang.String) */ public void getMinMaxSessionDashboardData(Integer sessionId, String minMaxSiteIds,String minMaxLineAbbr, String minMaxGroupCode, Boolean minMaxisReviewed,String isMinMaxSkus,String sortBy, String sortingOrder, Integer pageNumber, Integer numberOfRecordsPerPage, String exportType, - HttpServletResponse response, User user) throws Exception { + HttpServletResponse response, User user, Integer salesHistoryMin, Integer salesHistoryMax) throws Exception { - sessionDAO.getMinMaxSessionDashboardData(sessionId, minMaxSiteIds,minMaxLineAbbr, minMaxGroupCode,minMaxisReviewed, isMinMaxSkus,sortBy, sortingOrder, pageNumber, numberOfRecordsPerPage, exportType, response, user); + sessionDAO.getMinMaxSessionDashboardData(sessionId, minMaxSiteIds,minMaxLineAbbr, minMaxGroupCode,minMaxisReviewed, isMinMaxSkus,sortBy, sortingOrder, pageNumber, numberOfRecordsPerPage, exportType, response, user , salesHistoryMin, salesHistoryMax); } public ActionResultItem>> updateSkuDashboardTableSetReviewedList(Integer sessionId, @@ -516,8 +516,8 @@ } @Override - public Integer getMinMaxSessionDashboardCnt(int sessionId, String minMaxSiteIds, String minMaxLineAbbr, String minMaxGroupCode, Boolean minMaxisReviewed,String isMinMaxSkus) { - return sessionDAO.getMinMaxSessionDashboardCnt(sessionId, minMaxSiteIds, minMaxLineAbbr, minMaxGroupCode, minMaxisReviewed,isMinMaxSkus); + public Integer getMinMaxSessionDashboardCnt(int sessionId, String minMaxSiteIds, String minMaxLineAbbr, String minMaxGroupCode, Boolean minMaxisReviewed,String isMinMaxSkus,Integer salesHistoryMin,Integer salesHistoryMax) { + return sessionDAO.getMinMaxSessionDashboardCnt(sessionId, minMaxSiteIds, minMaxLineAbbr, minMaxGroupCode, minMaxisReviewed,isMinMaxSkus, salesHistoryMin, salesHistoryMax); } /*