Subversion Repositories SmartDukaan

Rev

Rev 31248 | Rev 31464 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31248 Rev 31259
Line 92... Line 92...
92
	@Autowired
92
	@Autowired
93
	private PartnerStatsService partnerStatsService;
93
	private PartnerStatsService partnerStatsService;
94
	List<String> emails = Arrays.asList("kamini.sharma@smartdukaan.com", "neeraj.gupta@smartdukaan.com",
94
	List<String> emails = Arrays.asList("kamini.sharma@smartdukaan.com", "neeraj.gupta@smartdukaan.com",
95
			"tejbeer.kaur@smartdukaan.com", "amit.gupta@smartdukaan.com", "kanan.choudhary@smartdukaan.com");
95
			"tejbeer.kaur@smartdukaan.com", "amit.gupta@smartdukaan.com", "kanan.choudhary@smartdukaan.com");
96
 
96
 
97
	List<String> colorList = Arrays.asList("mediumseagreen", "dodgerblue", "darkblue", "gold", "#eb0029", "coral", "#63C5DA",
97
	List<String> colorList = Arrays.asList("mediumseagreen", "dodgerblue", "darkblue", "gold", "#eb0029", "coral",
98
			"red", "deeppink", "midnightblue", "cornsilk");
98
			"#63C5DA", "red", "deeppink", "midnightblue", "cornsilk");
99
 
99
 
100
	List<String> borderList = Arrays.asList("lawngreen", "lightblue", "#0000cd", "#f7e98e", "#eb0029", "lightcoral", "#0000cd",
100
	List<String> borderList = Arrays.asList("lawngreen", "lightblue", "#0000cd", "#f7e98e", "#eb0029", "lightcoral",
101
			"lightsalmon", "pink", "#0000cd", "cornsilk");
101
			"#0000cd", "lightsalmon", "pink", "#0000cd", "cornsilk");
102
 
102
 
103
	List<String> brands = Arrays.asList("Oppo", "Vivo", "Samsung", "Realme", "OnePlus", "Xiaomi", "Tecno", "Itel", "Lava",
103
	List<String> brands = Arrays.asList("Oppo", "Vivo", "Samsung", "Realme", "OnePlus", "Xiaomi", "Tecno", "Itel",
104
			"Nokia");
104
			"Lava", "Nokia");
105
 
105
 
106
	private static final Logger LOGGER = LogManager.getLogger(AdminUser.class);
106
	private static final Logger LOGGER = LogManager.getLogger(AdminUser.class);
107
 
107
 
108
	public ChartModel getBrandWiseLmp(List<Integer> warehouseIds, List<Integer> fofoIds, LocalDate startDate,
108
	public ChartModel getBrandWiseLmp(List<Integer> warehouseIds, List<Integer> fofoIds, LocalDate startDate,
109
									  LocalDate endDate, String filterType) {
109
			LocalDate endDate, String filterType) {
110
		LOGGER.info("params" + warehouseIds + fofoIds + startDate);
110
		LOGGER.info("params" + warehouseIds + fofoIds + startDate);
111
 
111
 
112
		List<BrandWiseModel> brandWiseLms = orderRepository.selectGroupByBrandLmp(fofoIds, warehouseIds, startDate,
112
		List<BrandWiseModel> brandWiseLms = orderRepository.selectGroupByBrandLmp(fofoIds, warehouseIds, startDate,
113
				endDate, filterType);
113
				endDate, filterType);
114
		LOGGER.info("brandWiseLms" + brandWiseLms);
114
		LOGGER.info("brandWiseLms" + brandWiseLms);
Line 510... Line 510...
510
				ReporticoCacheTable rctSaholic = reporticoCacheTableRepository.selectByTableName("SaholicInventoryCIS");
510
				ReporticoCacheTable rctSaholic = reporticoCacheTableRepository.selectByTableName("SaholicInventoryCIS");
511
				model.addAttribute("reporticoDate", rctSaholic);
511
				model.addAttribute("reporticoDate", rctSaholic);
512
 
512
 
513
				// warehouseStock
513
				// warehouseStock
514
				warehousePartnerDetailMap = this.getWarehousePartnerDetail(warehouseIdFofoIdMap);
514
				warehousePartnerDetailMap = this.getWarehousePartnerDetail(warehouseIdFofoIdMap);
-
 
515
 
515
				ReporticoCacheTable rctPartneStat = reporticoCacheTableRepository.selectByTableName("partnerStat");
516
				ReporticoCacheTable rctPartneStat = reporticoCacheTableRepository.selectByTableName("partnerStat");
516
 
517
 
517
				Set<CustomRetailer> positionRetailers = fofoIds.stream()
518
				Set<CustomRetailer> positionRetailers = fofoIds.stream()
518
						.map(x -> retailerService.getAllFofoRetailers().get(x)).filter(x -> x != null)
519
						.map(x -> retailerService.getAllFofoRetailers().get(x)).filter(x -> x != null)
519
						.collect(Collectors.toSet());
520
						.collect(Collectors.toSet());