Index: src/main/java/com/napa/pulse/controller/rest/ReviewRestController.java =================================================================== diff -u -rfd110a605bd016bfba13aa86bec67809d1fb9690 -r8f2aa0ea403f950b99236e1006a0d29a965fff5c --- src/main/java/com/napa/pulse/controller/rest/ReviewRestController.java (.../ReviewRestController.java) (revision fd110a605bd016bfba13aa86bec67809d1fb9690) +++ src/main/java/com/napa/pulse/controller/rest/ReviewRestController.java (.../ReviewRestController.java) (revision 8f2aa0ea403f950b99236e1006a0d29a965fff5c) @@ -1411,7 +1411,7 @@ @Track @RequestMapping ( value = "/auth/site-sku-min-count", method = RequestMethod.POST ) public String getSiteSkuMinQtyCount ( @JwtToken ( PulseConstants.JWT_USER_DETAILS ) JwtUserData jwtUserData, - @RequestParam(required = false) Integer sessionId, @RequestParam ( required = false ) List siteList,@RequestParam(required = false)Integer productId, + @RequestParam(required = false) Integer sessionId, @RequestParam ( required = false ) String siteIds,@RequestParam(required = false)Integer productId, @RequestParam ( required = false ) HttpServletResponse response ) throws PulseException { if (!jwtUserData.getRoleAccessList().contains(AccessItem.REVIEW_PAGE.getNumVal())) { return PulseConstants.NO_ACCESS; @@ -1422,15 +1422,15 @@ if (jwtUserData.getRoleId() == ROLE.ADMIN.getNumVal() || jwtUserData.getRoleId() == ROLE.XO.getNumVal() || sessionService.validateUserSessionAccess(sessionId, jwtUserData.getUserId(), userAccessSites)) { - List responseData = reviewService.getSiteSkuMinQtyCount(sessionId, siteList,productId); + List responseData = reviewService.getSiteSkuMinQtyCount(sessionId, siteIds,productId); return gson.toJson(responseData); } else { // return 403 response.setStatus(HttpServletResponse.SC_FORBIDDEN); return gson.toJson(HttpServletResponse.SC_FORBIDDEN); } } catch (Exception e) { - LOGGER.error("skuTableWidgetSetReviewedList", e); + LOGGER.error("SiteCountForMinQty>0", e); throw new PulseException(PulseConstants.DEFAULT_SERVER_ERROR, e); } } Index: src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java =================================================================== diff -u -r02d561b9b1c061829fb9cb02d78eb3d24fe3b416 -r8f2aa0ea403f950b99236e1006a0d29a965fff5c --- src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision 02d561b9b1c061829fb9cb02d78eb3d24fe3b416) +++ src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java (.../ReviewDAOImpl.java) (revision 8f2aa0ea403f950b99236e1006a0d29a965fff5c) @@ -4867,33 +4867,29 @@ return siteCount; } - @Override - public List getSiteSkuMinQtyCount ( Integer sessionId ,List siteList, Integer productId ) { - if (siteList.size ()>0) - { - ListhubSiteProductsList = new ArrayList<> ( ); - String query = "select Distinct hsn_network_id,hsn_site_id from hub_spoke_network_mapping where hsn_site_id in ("+siteList+") and is_active = 1"; - SqlRowSet HsnsiteList = jdbcTemplate.queryForRowSet ( query ); - while ( HsnsiteList.next () ) + public List getSiteSkuMinQtyCount ( Integer sessionId ,String siteList, Integer productId ) { + if (siteList.length ()>0) { + List hubSiteProductsList = new ArrayList<> ( ); + String query = "select Distinct hsn_network_id,hsn_site_id from hub_spoke_network_mapping where hsn_site_id in (" + siteList + ") and is_active = 1"; + SqlRowSet HsnsiteList = jdbcTemplate.queryForRowSet ( query ); + while ( HsnsiteList.next ()) { HubSiteProducts hubSiteProducts = new HubSiteProducts (); - Integer hsnNetworkId = HsnsiteList.getInt ( 1 ); - Integer hsnSiteId = HsnsiteList.getInt ( 2 ); - String query2 = "select count(1) from site_product where site_id in (select HSN_SITE_ID from hub_spoke_network_mapping where hsn_network_id="+hsnNetworkId+") and product_id="+productId+" and MIN_STOCKING_QTY >0 ;"; + Integer hsnNetworkId = HsnsiteList.getInt ( "hsn_network_id" ); + Integer hsnSiteId = HsnsiteList.getInt ( "hsn_site_id" ); + String query2 = "select count(1) from site_product where site_id in (select HSN_SITE_ID from hub_spoke_network_mapping where hsn_network_id="+hsnNetworkId+") and product_id="+productId+" and MIN_STOCKING_QTY >0 "; SqlRowSet rowCount = jdbcTemplate.queryForRowSet ( query2 ); + while (rowCount.next ()) + { + hubSiteProducts.setCountMinQty ( rowCount.getInt ( 1 ) ); + } hubSiteProducts.setNetworkId ( hsnNetworkId ); hubSiteProducts.setHubSiteId ( hsnSiteId ); - hubSiteProducts.setCountMinQty ( rowCount.getInt ( 1 ) ); hubSiteProductsList.add ( hubSiteProducts ); } return hubSiteProductsList; - - } - - // select count(1) from site_product where site_id in - //(select HSN_SITE_ID from hub_spoke_network_mapping where hsn_network_id=240) and product_id=21440 and MIN_STOCKING_QTY >0 ; return null; } Index: src/main/java/com/napa/pulse/dao/interfaces/ReviewDAO.java =================================================================== diff -u -rfd110a605bd016bfba13aa86bec67809d1fb9690 -r8f2aa0ea403f950b99236e1006a0d29a965fff5c --- src/main/java/com/napa/pulse/dao/interfaces/ReviewDAO.java (.../ReviewDAO.java) (revision fd110a605bd016bfba13aa86bec67809d1fb9690) +++ src/main/java/com/napa/pulse/dao/interfaces/ReviewDAO.java (.../ReviewDAO.java) (revision 8f2aa0ea403f950b99236e1006a0d29a965fff5c) @@ -212,5 +212,5 @@ String getStockedNonStockedData(Integer sessionId); - List getSiteSkuMinQtyCount ( Integer sessionId , List siteList, Integer productId ); + List getSiteSkuMinQtyCount ( Integer sessionId , String siteList, Integer productId ); } \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/ReviewServiceImpl.java =================================================================== diff -u -rfd110a605bd016bfba13aa86bec67809d1fb9690 -r8f2aa0ea403f950b99236e1006a0d29a965fff5c --- src/main/java/com/napa/pulse/service/impl/ReviewServiceImpl.java (.../ReviewServiceImpl.java) (revision fd110a605bd016bfba13aa86bec67809d1fb9690) +++ src/main/java/com/napa/pulse/service/impl/ReviewServiceImpl.java (.../ReviewServiceImpl.java) (revision 8f2aa0ea403f950b99236e1006a0d29a965fff5c) @@ -171,7 +171,7 @@ } @Override - public List getSiteSkuMinQtyCount ( Integer sessionId , List siteList , Integer productId ) { + public List getSiteSkuMinQtyCount ( Integer sessionId , String siteList , Integer productId ) { return reviewDao.getSiteSkuMinQtyCount( sessionId , siteList , productId ); } Index: src/main/java/com/napa/pulse/service/interfaces/ReviewService.java =================================================================== diff -u -rfd110a605bd016bfba13aa86bec67809d1fb9690 -r8f2aa0ea403f950b99236e1006a0d29a965fff5c --- src/main/java/com/napa/pulse/service/interfaces/ReviewService.java (.../ReviewService.java) (revision fd110a605bd016bfba13aa86bec67809d1fb9690) +++ src/main/java/com/napa/pulse/service/interfaces/ReviewService.java (.../ReviewService.java) (revision 8f2aa0ea403f950b99236e1006a0d29a965fff5c) @@ -215,5 +215,5 @@ String stockedNonStockedData(Integer sessionId); - List getSiteSkuMinQtyCount ( Integer sessionId , List siteList , Integer productId ); + List getSiteSkuMinQtyCount ( Integer sessionId , String siteList , Integer productId ); }