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

 import com.spice.profitmandi.dao.model.InStockBrandModel;
 import com.spice.profitmandi.dao.model.ItemWiseTertiaryModel;
 import com.spice.profitmandi.dao.model.MonthSaleModel;
 import com.spice.profitmandi.dao.model.PartnerDetailModel;
 import com.spice.profitmandi.dao.model.PartnerPendingIndentItemModel;
+import com.spice.profitmandi.dao.model.PriceDropBrandModel;
 import com.spice.profitmandi.dao.model.PriceDropWithDetailsByYearMonthModel;
 import com.spice.profitmandi.dao.model.PriceDropYearMonthModel;
 import com.spice.profitmandi.dao.model.WarehouseBrandItemUnbilledActivatedModel;
 import com.spice.profitmandi.dao.model.WarehouseBrandWiseItemSaleModel;
 import com.spice.profitmandi.dao.model.WarehouseWiseBrandSaleModel;
 			ms.setPartnerType(partnerType);
 			ms.setMonth(startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
 			monthSaleMap.put(i, ms);
+		}
 		model.addAttribute("monthSales", monthSaleMap);
 		return "monthSales";
+	}
 	@RequestMapping(value = "/dashboard", method = RequestMethod.GET)
 				PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoStore.getId(), LocalDate.now());
 				model.addAttribute("partnerType", partnerType);
 				model.addAttribute("partnerTypeImage", PartnerType.imageMap.get(partnerType));
 				model.addAttribute("fofoStore", fofoStore);
 				model.addAttribute("partnerType", partnerType);
-				model.addAttribute("maa", loginDetails.getFofoId()==175138885);
+				model.addAttribute("maa", loginDetails.getFofoId() == 175138885);
 				model.addAttribute("hasGift", fofoUser.hasGift(loginDetails.getFofoId()));
 				model.addAttribute("giftItemId", ProfitMandiConstants.GIFT_ID);
 				model.addAttribute("retailers", new JSONObject().append("code", fofoStore.getCode())
 						.append("partnerId", fofoStore.getId()).toString());
 				model.addAttribute("activatedImeis",
 	@RequestMapping(value = "/getPriceDropDetails", method = RequestMethod.GET)
 	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 = true, defaultValue = "0") String yearMonth, Model model)
+			@RequestParam(name = "yearMonth", required = false, defaultValue = "0") String yearMonth, Model model)
 			throws Exception {
 		LOGGER.info("params" + fofoId + brand + yearMonth);
 		List<PriceDropWithDetailsByYearMonthModel> priceDropdetailsList = priceDropRepository
 		model.addAttribute("priceDropdetailsList", priceDropdetailsList);
 		return "price-drop-details";
+	}
+	@RequestMapping(value = "/getPriceDropDetailSixMonths", method = RequestMethod.GET)
+	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 {
+		LOGGER.info("params" + fofoId + brand);
+		LocalDateTime curDate = LocalDate.now().atStartOfDay();
+		LocalDateTime startfMonthSixMonth = curDate.withDayOfMonth(1).minusMonths(12);
+		LocalDateTime endMonthTotal = curDate.withDayOfMonth(1).minusMonths(6);
+		List<PriceDropWithDetailsByYearMonthModel> priceDropdetailsList = priceDropRepository
+				.selectBrandPendingPriceDropWithDetailsAndSixMonth(fofoId, brand, startfMonthSixMonth,endMonthTotal);
+		LOGGER.info("priceDropdetailsList" + priceDropdetailsList);
+		model.addAttribute("priceDropdetailsList", priceDropdetailsList);
+		return "price-drop-details";
+	}
 	@RequestMapping(value = "/getMonthlyPriceDrop", method = RequestMethod.GET)
 	public String getMonthlyPriceDropTabular(HttpServletRequest request, Model model) throws Exception {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		int fofoId = loginDetails.getFofoId();
 		LocalDateTime curDate = LocalDate.now().atStartOfDay();
 		LocalDateTime startOfMonth = curDate.withDayOfMonth(1).minusMonths(6);
+		LocalDateTime startfMonthTotal = curDate.withDayOfMonth(1).minusMonths(12);
+		LocalDateTime endMonthTotal = curDate.withDayOfMonth(1).minusMonths(6);
-		List<YearMonth> ym = new ArrayList<YearMonth>();
+		List<YearMonth> yms = new ArrayList<YearMonth>();
 		for (int i = 1; i <= 6; i++) {
-			ym.add(YearMonth.from(curDate.withDayOfMonth(1).minusMonths(i)));
+			yms.add(YearMonth.from(curDate.withDayOfMonth(1).minusMonths(i)));
+		}
-		Collections.reverse(ym);
+		Collections.reverse(yms);
-		model.addAttribute("ym", ym);
+		model.addAttribute("yms", yms);
-		LOGGER.info("ym" + ym);
+		LOGGER.info("ym" + yms);
 		List<PriceDropYearMonthModel> priceDropYearMonthModels = priceDropRepository
 				.selectBrandPendingPriceDropByYearMonth(fofoId, startOfMonth);
+		List<PriceDropBrandModel> priceDropBrandSixMonthTotals = priceDropRepository
+				.selectSixMonthBrandPriceDropByYearMonth(fofoId, startfMonthTotal, endMonthTotal);
 		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("MM-yyyy");
 		Map<String, Map<YearMonth, Double>> brandMonthValue = new HashMap<>();
+		LOGGER.info("priceDropBrandSixMonthTotals" + priceDropBrandSixMonthTotals);
+		Map<String, Double> priceDropBrandSixMonthMap=priceDropBrandSixMonthTotals.stream().collect(Collectors.toMap(x->x.getBrand(), x->(double)x.getAmount()));
+		model.addAttribute("priceDropBrandSixMonthMap", priceDropBrandSixMonthMap);
 		LOGGER.info("priceDropYearMonthModels" + priceDropYearMonthModels);
-		for (PriceDropYearMonthModel pdm : priceDropYearMonthModels) {
+		for (PriceDropYearMonthModel pdm : priceDropYearMonthModels) {
 			Map<YearMonth, Double> brandValue = new HashMap<>();
 			if (brandMonthValue.containsKey(pdm.getBrand())) {
 				brandValue = brandMonthValue.get(pdm.getBrand());
 				brandValue.put(YearMonth.parse(pdm.getYearMonth(), dateTimeFormatter), (double) pdm.getAmount());
 			} else {
 		brands.add("Tecno");
 		brands.add("Itel");
 		brands.add("Nokia");
 		Map<String, List<Double>> sortedBrandValue = new LinkedHashMap<>();
+       model.addAttribute("brands", brands);
 		for (String brand : brands) {
 			Map<YearMonth, Double> yearMonthValue = brandMonthValue.get(brand);
 			for (int i = 6; i >= 1; i--) {
 				LocalDateTime startMonth = curDate.withDayOfMonth(1).minusMonths(i);

Subversion Repositories SmartDukaan

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