WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

                 Scheme staticScheme = schemeService.getStaticScheme(fofoId);
                 double schemeAchievement = 0;
                 String schemeCategory = null;
                 if (staticScheme != null) {
-                    schemeAchievement = orderRepository.selectBillingDatesBetweenSumGroupByRetailerId(staticScheme.getStartDateTime(), staticScheme.getEndDateTime()).get(fofoId);
+                    Map<Integer, Double> schemeAchievementMap = orderRepository.selectBillingDatesBetweenSumGroupByRetailerId(staticScheme.getStartDateTime(), staticScheme.getEndDateTime());
+                    if (schemeAchievementMap.get(fofoId) != null) {
+                        schemeAchievement = schemeAchievementMap.get(fofoId);
-                    if (staticScheme.getTarget() >= 2500000 && staticScheme.getTarget() < 3750000) {
+                        if (staticScheme.getTarget() >= 2500000 && staticScheme.getTarget() < 3750000) {
-                        schemeCategory = "SD Club";
+                            schemeCategory = "SD Club";
-                    } else if (staticScheme.getTarget() < 5000000) {
+                        } else if (staticScheme.getTarget() < 5000000) {
-                        schemeCategory = "Silver";
+                            schemeCategory = "Silver";
-                    } else if (staticScheme.getTarget() < 7500000) {
+                        } else if (staticScheme.getTarget() < 7500000) {
-                        schemeCategory = "Gold - 1";
+                            schemeCategory = "Gold - 1";
-                    } else if (staticScheme.getTarget() < 10000000) {
+                        } else if (staticScheme.getTarget() < 10000000) {
-                        schemeCategory = "Gold - 2";
+                            schemeCategory = "Gold - 2";
-                    } else if (staticScheme.getTarget() < 12500000) {
+                        } else if (staticScheme.getTarget() < 12500000) {
-                        schemeCategory = "Diamond";
+                            schemeCategory = "Diamond";
-                    } else {
+                        } else {
-                        schemeCategory = "Platinum";
+                            schemeCategory = "Platinum";
+                        }
+                    }
+                }
                 model.addAttribute("countOrder", countOrder);
                 model.addAttribute("hygienePercentage", (hygieneCount * 100) / (invalidHygieneCount + hygieneCount));
                 model.addAttribute("monthDays", LocalDate.now().minusDays(1).lengthOfMonth());
                 model.addAttribute("dayOfMonth", LocalDate.now().minusDays(1).getDayOfMonth());
             } catch (
-                    ProfitMandiBusinessException e) {
+                ProfitMandiBusinessException e) {
                 LOGGER.error("FofoStore Code not found of fofoId {}", loginDetails.getFofoId());
+            }
             return "dashboard1";
+        }
     @Autowired
     OfferPayoutRepository offerPayoutRepository;
     @RequestMapping(value = "/partnerTotalIncomeByMonth/{yearMonth}", method = RequestMethod.GET)
-    public String getPartnerTotalIncomeByMonth(HttpServletRequest request, @PathVariable int yearMonth, Model
+    public String getPartnerTotalIncomeByMonth(HttpServletRequest request, @PathVariable int yearMonth, Model model) throws Exception {
-            model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         long pendingIncome = 0;
         long partnerPurchaseIn = 0;
         long partnerCreditedSale = 0;
         return "partner-total-income";
+    }
     @RequestMapping(value = "/getMonthsInvestment", method = RequestMethod.GET)
-    public String getMonthsInvestment(HttpServletRequest request,
-                                      @RequestParam(name = "month", required = true, defaultValue = "0") int month, Model model) throws Exception {
+    public String getMonthsInvestment(HttpServletRequest request, @RequestParam(name = "month", required = true, defaultValue = "0") int month, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         int fofoId = loginDetails.getFofoId();
         Map<String, Object> investment = fofoUser.getInvestmentsMonths(fofoId, month);
         LocalDateTime currentMonthStart = LocalDateTime.now().withDayOfMonth(1);
         return "bar_chart";
+    }
     @RequestMapping(value = "/getPriceDropDetails", method = RequestMethod.GET)
-    public String getPriceDropDetails(HttpServletRequest request,
+    public String getPriceDropDetails(HttpServletRequest request, @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId, @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, @RequestParam(name = "yearMonth", required = false, defaultValue = "0") String yearMonth, Model model) throws Exception {
-                                      @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
-                                      @RequestParam(name = "brand", required = true, defaultValue = "0") String brand,
-                                      @RequestParam(name = "yearMonth", required = false, defaultValue = "0") String yearMonth, Model model) throws
-            Exception {
         LOGGER.info("params" + fofoId + brand + yearMonth);
         List<PriceDropWithDetailsByYearMonthModel> priceDropdetailsList = priceDropRepository.selectBrandPendingPriceDropWithDetailsByYearMonth(fofoId, brand, yearMonth);
         return "price-drop-details";
+    }
     @RequestMapping(value = "/getPriceDropDetailSixMonths", method = RequestMethod.GET)
-    public String getPriceDropDetailSixMonths(HttpServletRequest request,
+    public String getPriceDropDetailSixMonths(HttpServletRequest request, @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId, @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model) throws Exception {
-                                              @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
-                                              @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model) throws
-            Exception {
         LOGGER.info("params" + fofoId + brand);
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         LocalDateTime startfMonthSixMonth = curDate.withDayOfMonth(1).minusMonths(12);
         LocalDateTime endMonthTotal = curDate.withDayOfMonth(1).minusMonths(6);
         model.addAttribute("fofoId", fofoId);
         return "activation-tabular";
+    }
     @RequestMapping(value = "/getMonthlyActivationItemDetail", method = RequestMethod.GET)
-    public String getMonthlyActivationItemDetail(HttpServletRequest request,
+    public String getMonthlyActivationItemDetail(HttpServletRequest request, @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId, @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, @RequestParam(name = "yearMonth", required = false, defaultValue = "0") String yearMonth, Model model) throws Exception {
-                                                 @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
-                                                 @RequestParam(name = "brand", required = true, defaultValue = "0") String brand,
-                                                 @RequestParam(name = "yearMonth", required = false, defaultValue = "0") String yearMonth, Model model) throws
-            Exception {
         LOGGER.info("params" + fofoId + brand + yearMonth);
         List<ActivationItemDetailModel> activationItemDetails = schemeInOutRepository.selectBrandPendingActivationItemDetails(fofoId, brand, yearMonth);
         return "activation-pending-item-details";
+    }
     @RequestMapping(value = "/getMonthlyActivationBeforeSixMonthsItemDetail", method = RequestMethod.GET)
-    public String getMonthlyActivationItemDetail(HttpServletRequest request,
+    public String getMonthlyActivationItemDetail(HttpServletRequest request, @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId, @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model) throws Exception {
-                                                 @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
-                                                 @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model) throws
-            Exception {
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         LocalDateTime startOfMonth = curDate.withDayOfMonth(1).minusMonths(6);
         List<ActivationItemDetailModel> activationItemDetails = schemeInOutRepository.selectBrandPendingActivationItemDetailByYearMonth(fofoId, brand, startOfMonth);
         return "upgrade-offer-tabular";
+    }
     @RequestMapping(value = "/getMonthlyUpgradeOfferItemDetail", method = RequestMethod.GET)
-    public String getMonthlyUpgradeOfferItemDetail(HttpServletRequest request,
+    public String getMonthlyUpgradeOfferItemDetail(HttpServletRequest request, @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId, @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, @RequestParam(name = "yearMonth", required = false, defaultValue = "0") String yearMonth, Model model) throws Exception {
-                                                   @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
-                                                   @RequestParam(name = "brand", required = true, defaultValue = "0") String brand,
-                                                   @RequestParam(name = "yearMonth", required = false, defaultValue = "0") String yearMonth, Model model) throws
-            Exception {
         LOGGER.info("params" + fofoId + brand + yearMonth);
         List<UpgradeOfferItemDetailModel> offerItems = samsungUpgradeOfferRepository.selectUpgradeOfferItemDetails(fofoId, UpgradeOfferStatus.approved, brand, yearMonth);
         model.addAttribute("offerItems", offerItems);
         return "upgrade-offer-item-detail";
+    }
     @RequestMapping(value = "/getUpgradeOfferBeforeSixMonthItemDetail", method = RequestMethod.GET)
-    public String getUpgradeOfferBeforeSixMonthItemDetail(HttpServletRequest request,
+    public String getUpgradeOfferBeforeSixMonthItemDetail(HttpServletRequest request, @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId, @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model) throws Exception {
-                                                          @RequestParam(name = "fofoId", required = true, defaultValue = "0") int fofoId,
-                                                          @RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model) throws
-            Exception {
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         LocalDateTime startOfMonth = curDate.withDayOfMonth(1).minusMonths(6);
         List<UpgradeOfferItemDetailModel> offerItems = samsungUpgradeOfferRepository.selectUpgradeOfferItemDetailByYearMonth(fofoId, UpgradeOfferStatus.approved, brand, startOfMonth);
         return "upgrade-offer-item-detail";
+    }
     @RequestMapping(value = "/getAuthUserPartners", method = RequestMethod.GET)
-    public String AuthUserPartnersDetail(HttpServletRequest request, Model model, @RequestParam int authId) throws
+    public String AuthUserPartnersDetail(HttpServletRequest request, Model model, @RequestParam int authId) throws Exception {
-            Exception {
         Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
         Map<Integer, CustomRetailer> fofoIdAndPartnerMap = retailerService.getFofoRetailers(false);
         Map<Integer, PartnerDetailModel> fofoIdAndallValues = partnerStatsService.getAllPartnerStats();
         return "auth_user_partner_detail";
+    }
     @RequestMapping(value = "/getWarehousePartners", method = RequestMethod.GET)
-    public String warehousePartnersDetail(HttpServletRequest request, Model model, @RequestParam int warehouseId) throws
+    public String warehousePartnersDetail(HttpServletRequest request, Model model, @RequestParam int warehouseId) throws Exception {
-            Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Set<Integer> authfofoIds = new HashSet<>();
         authfofoIds = csService1.getAuthFofoIds(email, true);
         return "auth_user_partner_detail";
+    }
     @RequestMapping(value = "/getWarehouseWiseBrandStock", method = RequestMethod.GET)
-    public String getWarehouseWiseBrandStock(HttpServletRequest request, Model
+    public String getWarehouseWiseBrandStock(HttpServletRequest request, Model model, @RequestParam List<Integer> warehouseId) throws Exception {
-            model, @RequestParam List<Integer> warehouseId) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Set<Integer> authfofoIds = csService1.getAuthFofoIds(email, true);
         Map<Integer, List<Integer>> warehouseIdFofoIdMap = fofoStoreRepository.selectActivePartnersByRetailerIds(new ArrayList<>(authfofoIds)).stream().collect(Collectors.groupingBy(
                 FofoStore::getWarehouseId, Collectors.mapping(FofoStore::getId, Collectors.toList())));
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
     @RequestMapping(value = "/getWarehouseWiseBrandAndCategory", method = RequestMethod.GET)
-    public String getWarehouseWiseBrandAndCategory(HttpServletRequest request, Model
-            model, @RequestParam List<Integer> warehouseId, @RequestParam List<String> brands, @RequestParam String
+    public String getWarehouseWiseBrandAndCategory(HttpServletRequest request, Model model, @RequestParam List<Integer> warehouseId, @RequestParam List<String> brands, @RequestParam String category) throws Exception {
-                                                           category) throws Exception {
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         List<String> listbrands = saholicInventoryCISRepository.selectAllBrand();
         List<String> listCategory = saholicInventoryCISRepository.selectAllSubCategory();
         return "warehouse_brand_item_stock";
+    }
     @RequestMapping(value = "/getWarehouseWiseItemStock", method = RequestMethod.GET)
-    public String getWarehouseWiseItemStock(HttpServletRequest request, Model
-            model, @RequestParam List<Integer> warehouseId, @RequestParam List<String> brands, @RequestParam String
+    public String getWarehouseWiseItemStock(HttpServletRequest request, Model model, @RequestParam List<Integer> warehouseId, @RequestParam List<String> brands, @RequestParam String category) throws Exception {
-                                                    category) throws Exception {
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         if (warehouseId.contains(0)) {
             warehouseId.addAll(warehouseMap.keySet());
+        }
         List<WarehouseWiseitemStockModel> warehouseWiseItemStock = saholicInventoryCISRepository.selectWarehouseItemStock(warehouseId, brands, category);
         model.addAttribute("warehouseMap", warehouseMap);
         return "warehouse_item_details";
+    }
     @RequestMapping(value = "/getWarehouseWiseBrandPartnerSale", method = RequestMethod.GET)
-    public String getWarehouseWiseBrandPartnerSale(HttpServletRequest request, Model
+    public String getWarehouseWiseBrandPartnerSale(HttpServletRequest request, Model model, @RequestParam String brand) throws Exception {
-            model, @RequestParam String brand) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Set<Integer> authfofoIds = csService1.getAuthFofoIds(email, true);
         model.addAttribute("selectedbrand", brand);
         return "warehousewise_brand_partners_sale";
+    }
     @RequestMapping(value = "/getWarehouseWiseAccesoriesBrandPartnerSale", method = RequestMethod.GET)
-    public String getWarehouseWiseAccesoriesBrandPartnerSale(HttpServletRequest request, Model
+    public String getWarehouseWiseAccesoriesBrandPartnerSale(HttpServletRequest request, Model model, @RequestParam String brand) throws Exception {
-            model, @RequestParam String brand) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
         Set<Integer> authfofoIds = storeGuyMap.get(email);
         model.addAttribute("selectedbrand", brand);
         return "warehousewise_accessoriesbrand_sale";
+    }
     @RequestMapping(value = "/getWarehouseBrandWiseItemSale", method = RequestMethod.GET)
-    public String getWarehouseBrandWiseItemSale(HttpServletRequest request, Model
-            model, @RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
+    public String getWarehouseBrandWiseItemSale(HttpServletRequest request, Model model, @RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Set<Integer> authfofoIds = csService1.getAuthFofoIds(email, true);
         Map<Integer, WarehouseBrandWiseItemSaleModel> branditemSalesMap = fofoStoreRepository.selectWarehouseBrandItemSale(warehouseId, brand, new ArrayList<>(authfofoIds)).stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x));
         model.addAttribute("warehouseMap", warehouseMap);
         return "warehouse_partner_itemwise_sale";
+    }
     @RequestMapping(value = "/getWarehouseAccesoriesBrandWiseItemSale", method = RequestMethod.GET)
-    public String getWarehouseAccesoriesBrandWiseItemSale(HttpServletRequest request, Model
-            model, @RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
+    public String getWarehouseAccesoriesBrandWiseItemSale(HttpServletRequest request, Model model, @RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
         Set<Integer> authfofoIds = storeGuyMap.get(email);
         model.addAttribute("appContextPath", request.getContextPath());
         return "contact-us";
+    }
     @RequestMapping(value = "/notifications", method = RequestMethod.GET)
-    public String getNotificationsWithType(HttpServletRequest
+    public String getNotificationsWithType(HttpServletRequest request, @RequestParam(required = false) MessageType messageType, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "20") int limit, Model model) throws Exception {
-                                                   request, @RequestParam(required = false) MessageType messageType,
-                                           @RequestParam(name = "offset", defaultValue = "0") int offset,
-                                           @RequestParam(name = "limit", defaultValue = "20") int limit, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         int userId = 0;
         boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
         if (isAdmin) {
             userId = loginDetails.getFofoId();
         LOGGER.info("notifications" + notifications);
         return "notification-template";
+    }
     @RequestMapping(value = "/notifyDocument/documentId", method = RequestMethod.GET)
-    public ResponseEntity<?> retailerDocumentById(HttpServletRequest request,
-                                                  @RequestParam(name = ProfitMandiConstants.DOCUMENT_ID) int documentId, @RequestParam int cid) throws
+    public ResponseEntity<?> retailerDocumentById(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.DOCUMENT_ID) int documentId, @RequestParam int cid) throws ProfitMandiBusinessException {
-            ProfitMandiBusinessException {
         Document document = documentRepository.selectById(documentId);
         NotificationCampaign nc = notificationCampaignRepository.selectById(cid);
         if (nc.getDocumentId() == null) {
             throw new ProfitMandiBusinessException("cid", nc.getId(), "not available");
+        }
+        }
         return responseSender.ok(document);
+    }
     @RequestMapping(value = "/notifyDocument/download", method = RequestMethod.GET)
-    public ResponseEntity<?> downloadRetailerDocument(HttpServletRequest request, @RequestParam int cid, Model
+    public ResponseEntity<?> downloadRetailerDocument(HttpServletRequest request, @RequestParam int cid, Model model) throws ProfitMandiBusinessException {
-            model) throws ProfitMandiBusinessException {
         NotificationCampaign nc = notificationCampaignRepository.selectById(cid);
         if (nc.getDocumentId() == null) {
             throw new ProfitMandiBusinessException("cid", nc.getId(), "not available");
         final InputStreamResource inputStreamResource = new InputStreamResource(file);
         return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+    }
     @RequestMapping(value = "/getItemWiseTertiary", method = RequestMethod.GET)
-    public String getItemWiseTertiary(HttpServletRequest request,
-                                      @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws
+    public String getItemWiseTertiary(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws ProfitMandiBusinessException {
-            ProfitMandiBusinessException {
         List<ItemWiseTertiaryModel> itemWiseTertiary = fofoOrderRepository.SelectItemWiseTertiary(fofoId);
         LOGGER.info("itemWiseTertiary" + itemWiseTertiary);
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         model.addAttribute("customRetailer", customRetailer);
         model.addAttribute("itemWiseTertiary", itemWiseTertiary);
         return "item-wise-tertiary";
+    }
     @RequestMapping(value = "/getItemWiseIndent", method = RequestMethod.GET)
-    public String getItemWiseIndent(HttpServletRequest request,
-                                    @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws
+    public String getItemWiseIndent(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws ProfitMandiBusinessException {
-            ProfitMandiBusinessException {
         List<Order> unbilledOrders = transactionService.getInTransitOrders(fofoId);
         model.addAttribute("unbilledOrders", unbilledOrders);
         return "item-wise-indent";
+    }
     @RequestMapping(value = "/getPartnerInvestment", method = RequestMethod.GET)
-    public String getPartnerInvestment(HttpServletRequest request,
-                                       @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+    public String getPartnerInvestment(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
         Map<Integer, PartnerDetailModel> partnerStats = adminUser.getPartnersStatDataFromFile();
         PartnerDetailModel partnerDetailModel = partnerStats.get(fofoId);
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         model.addAttribute("partnerDetailModel", partnerDetailModel);
         model.addAttribute("customRetailer", customRetailer);
         return "partner-investment";
+    }
     @RequestMapping(value = "/getPartnerPendingIndentItem", method = RequestMethod.GET)
-    public String getPartnerPendingIndentItem(HttpServletRequest request, @RequestParam int warehouseId,
+    public String getPartnerPendingIndentItem(HttpServletRequest request, @RequestParam int warehouseId, @RequestParam int itemId, Model model) throws ProfitMandiBusinessException {
-                                              @RequestParam int itemId, Model model) throws ProfitMandiBusinessException {
         List<PartnerPendingIndentItemModel> partnerPendingIndent = fofoStoreRepository.selectPartnerPendingIndentItem(itemId, warehouseId);
         model.addAttribute("partnerPendingIndent", partnerPendingIndent);
         return "partner-pending-indent-item";
+    }
     @RequestMapping(value = "/getPatnerActivateStock", method = RequestMethod.GET)
-    public String getPartnerActivateStockItem(HttpServletRequest request,
-                                              @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+    public String getPartnerActivateStockItem(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
         List<ActivateItemModel> activateStocks = new ArrayList<>();
         List<InventoryItem> inventoryItems = inventoryItemRepository.selectByActivatedNotSold(fofoId);
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         for (InventoryItem inventoryItem : inventoryItems) {
         model.addAttribute("customRetailer", customRetailer);
         return "partner-activate-stock";
+    }
     @RequestMapping(value = "/getPatnerBrandWiseMTDSale", method = RequestMethod.GET)
-    public String getPatnerBrandWiseMTDSale(HttpServletRequest request,
-                                            @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+    public String getPatnerBrandWiseMTDSale(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         Map<String, Double> brandMtdAmount = fofoOrderItemRepository.selectSumAmountGroupByBrand(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), fofoId);
         Map<String, Long> brandMtdQty = fofoOrderItemRepository.selectSumQuantityGroupByBrand(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), fofoId);
         Double accesoriesmtdsale = fofoOrderRepository.selectSumSaleGroupByFofoIdsForMobileOrAccessories(fofoId, curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), Optional.of(false)).get(fofoId);
         model.addAttribute("customRetailer", customRetailer);
         return "partner-brand-mtd-sale";
+    }
     @RequestMapping(value = "/getPatnerBrandWiseLMTDSale", method = RequestMethod.GET)
-    public String getPatnerBrandWiseLMTDSale(HttpServletRequest request,
-                                             @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+    public String getPatnerBrandWiseLMTDSale(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         Map<String, Double> brandLMtdAmount = fofoOrderItemRepository.selectSumAmountGroupByBrand(
                 curDate.withDayOfMonth(1).minusMonths(1), curDate.with(LocalTime.MAX).minusMonths(1), fofoId);
         Map<String, Long> brandLmtdQty = fofoOrderItemRepository.selectSumQuantityGroupByBrand(
         model.addAttribute("customRetailer", customRetailer);
         return "partner-brand-lmtd-sale";
+    }
     @RequestMapping(value = "/getPatnerBrandWiseLMSSale", method = RequestMethod.GET)
-    public String getPatnerBrandWiseLMSSale(HttpServletRequest request,
-                                            @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+    public String getPatnerBrandWiseLMSSale(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         int lengthOfMonth = YearMonth.from(curDate.minusMonths(1)).lengthOfMonth();
         Map<String, Double> brandLMSAmount = fofoOrderItemRepository.selectSumAmountGroupByBrand(
         model.addAttribute("customRetailer", customRetailer);
         return "partner-brand-lms-sale";
+    }
     @RequestMapping(value = "/getPatnerInStock", method = RequestMethod.GET)
-    public String getPatnerInStock(HttpServletRequest request,
-                                   @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+    public String getPatnerInStock(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         List<InStockBrandModel> mobileStocks = currentInventorySnapshotRepository.selectSumInStockMobileGroupByBrand(fofoId);
         List<InStockBrandModel> accesStock = currentInventorySnapshotRepository.selectSumInStockAccessoriesGroupByBrand(fofoId);
         model.addAttribute("customRetailer", customRetailer);
         return "partner-instock-item";
+    }
     @RequestMapping(value = "/getOpenTicketByFofoId", method = RequestMethod.GET)
-    public String getOpenTicketByFofoId(HttpServletRequest request,
-                                        @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
+    public String getOpenTicketByFofoId(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, Model model) throws Exception {
         Map<Integer, AuthUser> ticketIdAuthUser = new HashMap<>();
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         List<Integer> ticketIds = ticketRepository.selectAllOpenTicketByRetailer(fofoId).stream().map(x -> x.getId()).collect(Collectors.toList());
         List<TicketAssigned> ticketAssigns = ticketAssignedRepository.selectByTicketIds(ticketIds);
         model.addAttribute("customRetailer", customRetailer);
         return "open-ticket";
+    }
     @RequestMapping(value = "/getPartnerSecondarySale", method = RequestMethod.GET)
-    public String getPartnerSecondarySale(HttpServletRequest request,
-                                          @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, @RequestParam String timeValue, Model model) throws
+    public String getPartnerSecondarySale(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.FOFO_ID) int fofoId, @RequestParam String timeValue, Model model) throws Exception {
-            Exception {
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
         int lengthOfMonth = YearMonth.from(curDate.minusMonths(1)).lengthOfMonth();
         LocalDateTime startDate = null;
         LocalDateTime endDate = null;
         model.addAttribute("accessoriesBrandSales", accessoriesBrandSales);
         return "accessories-brand-wise-report";
+    }
     @RequestMapping(value = "/getMobileLMSGraph", method = RequestMethod.GET)
-    public String getMobileLMSGraph(HttpServletRequest request, @RequestParam(required = false) int warehouseId,
+    public String getMobileLMSGraph(HttpServletRequest request, @RequestParam(required = false) int warehouseId, @RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate, @RequestParam List<Integer> fofoIds, @RequestParam String filterType, Model model) throws Exception {
-                                    @RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate,
-                                    @RequestParam List<Integer> fofoIds, @RequestParam String filterType, Model model) throws Exception {
         Map<Integer, List<Integer>> warehouseIdFofoIdMap = fofoStoreRepository.selectActivePartnersByRetailerIds(new ArrayList<>(fofoIds)).stream().collect(Collectors.groupingBy(
                 FofoStore::getWarehouseId, Collectors.mapping(FofoStore::getId, Collectors.toList())));
         ChartModel cm;
         if (warehouseId != 0) {
         model.addAttribute("chartMap", gson.toJson(cm));
         return "brand-wise-mobile-lms-chart";
+    }
     @RequestMapping(value = "/getMobileLMSFilter", method = RequestMethod.GET)
-    public String getMobileLMSFilter(HttpServletRequest request,
+    public String getMobileLMSFilter(HttpServletRequest request, @RequestParam(required = false, defaultValue = "0") int warehouseId, @RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate, Model model) throws Exception {
-                                     @RequestParam(required = false, defaultValue = "0") int warehouseId,
-                                     @RequestParam(required = false) LocalDateTime date,
-                                     @RequestParam(required = false) LocalDateTime endDate, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         if (date == null) {
         return "chart-filter-lms";
+    }
     @RequestMapping(value = "/getMobileLMPGraph", method = RequestMethod.GET)
-    public String getMobileLMPGraph(HttpServletRequest request, @RequestParam(required = false) int warehouseId,
+    public String getMobileLMPGraph(HttpServletRequest request, @RequestParam(required = false) int warehouseId, @RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate, @RequestParam List<Integer> fofoIds, @RequestParam String filterType, Model model) throws Exception {
-                                    @RequestParam(required = false) LocalDateTime date, @RequestParam(required = false) LocalDateTime endDate,
-                                    @RequestParam List<Integer> fofoIds, @RequestParam String filterType, Model model) throws Exception {
         Map<Integer, List<Integer>> warehouseIdFofoIdMap = fofoStoreRepository.selectActivePartnersByRetailerIds(new ArrayList<>(fofoIds)).stream().collect(Collectors.groupingBy(
                 FofoStore::getWarehouseId, Collectors.mapping(FofoStore::getId, Collectors.toList())));
         ChartModel cm;
         if (warehouseId != 0) {
         model.addAttribute("chartMap", gson.toJson(cm));
         return "brand-wise-mobile-lmp-chart";
+    }
     @RequestMapping(value = "/getSaleCountByMilestone", method = RequestMethod.GET)
-    public String getSaleCountByMilestone(HttpServletRequest request,
-                                          @RequestParam(required = false, defaultValue = "0") int warehouseId, Model model) throws Exception {
+    public String getSaleCountByMilestone(HttpServletRequest request, @RequestParam(required = false, defaultValue = "0") int warehouseId, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Set<Integer> authFofoIds = csService1.getAuthFofoIds(email, true);
         return "sale-milestone";
+    }
     @RequestMapping(value = "/getPurchaseCountByMileStone", method = RequestMethod.GET)
-    public String getPurchaseCountByMileStone(HttpServletRequest request,
-                                              @RequestParam(required = false, defaultValue = "0") int warehouseId, Model model) throws Exception {
+    public String getPurchaseCountByMileStone(HttpServletRequest request, @RequestParam(required = false, defaultValue = "0") int warehouseId, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         Set<Integer> authFofoIds = csService1.getAuthFofoIds(email, true);
         return "purchase-milestone";
+    }
     @RequestMapping(value = "/getActivatedModelWarehouseWise", method = RequestMethod.GET)
-    public String getActivatedModelWarehouseWise(HttpServletRequest request, Model model, @RequestParam String
+    public String getActivatedModelWarehouseWise(HttpServletRequest request, Model model, @RequestParam String brand) throws Exception {
-            brand) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         List<Integer> fofoIds = getFofoIds(loginDetails);
         List<WarehouseWiseActivatedModel> warehouseWiseActivatedModels = activatedImeiRepository.selectActivatedModelGroupByWarehouse(brand, fofoIds);
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         model.addAttribute("activatedModels", activatedModels);
         return "activation-brandwise-report";
+    }
     @RequestMapping(value = "/getWarehouseBrandWiseItemActivatedModel", method = RequestMethod.GET)
-    public String getWarehouseBrandWiseItemActivatedModel(HttpServletRequest request, Model
-            model, @RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
+    public String getWarehouseBrandWiseItemActivatedModel(HttpServletRequest request, Model model, @RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         List<Integer> fofoIds = getFofoIds(loginDetails);
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         List<WarehouseBrandWiseItemActivatedModel> activatedItems = activatedImeiRepository.selectWarehouseBrandActivatedItem(warehouseId, brand, fofoIds);
+        }
         return new ArrayList<>(fofoIds);
+    }
     @RequestMapping(value = "/getMonthWiseSale", method = RequestMethod.GET)
-    public String getPartnerSaleByMonth(HttpServletRequest
-                                                request, @RequestParam List<Integer> fofoIds, Model model) throws Exception {
+    public String getPartnerSaleByMonth(HttpServletRequest request, @RequestParam List<Integer> fofoIds, Model model) throws Exception {
         YearMonth now = YearMonth.now();
         YearMonth ym = YearMonth.now().minusMonths(12);
         List<YearMonth> list = new ArrayList<>();
         while (!now.isBefore(ym)) {
         return "monthly-partner-sale";
+    }
     @RequestMapping(value = "/getMonthWisePurchase", method = RequestMethod.GET)
-    public String getMonthWisePurchase(HttpServletRequest
-                                               request, @RequestParam List<Integer> fofoIds, Model model) throws Exception {
+    public String getMonthWisePurchase(HttpServletRequest request, @RequestParam List<Integer> fofoIds, Model model) throws Exception {
         YearMonth now = YearMonth.now();
         YearMonth ym = YearMonth.now().minusMonths(12);
         List<YearMonth> list = new ArrayList<>();
         while (!now.isBefore(ym)) {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java – Rev 32308 → 32313