Subversion Repositories SmartDukaan

Rev

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

Rev 24569 Rev 24570
Line 458... Line 458...
458 
		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 458 
		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
459 
		List<Ticket> tickets = null;
 459 
		List<Ticket> tickets = null;
460 
		Map<Integer, List<AuthUser>> authUserListMap = null;
 460 
		Map<Integer, List<AuthUser>> authUserListMap = null;
461 
		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 461 
		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
462 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 462 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
463 
			authUserListMap = csService.getAuthUserList(tickets, EscalationType.L4);
 463 
			authUserListMap = csService.getAuthUserList(tickets,authUser);
464 
			size = ticketRepository.selectAllCount();
 464 
			size = ticketRepository.selectAllCount();
465 
		} else {
 465 
		} else {
466 
			tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L2, offset, limit);
 466 
			tickets=ticketRepository.selectAllByEscalatedUserType(authUser.getId(), offset, limit);
467 
			if (tickets.size() == 0) {
 - 
 
468 
				tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L3, offset,
 467 
			authUserListMap = csService.getAuthUserList(tickets,authUser);
469 
						limit);
 - 
 
470 
				size = ticketRepository.selectAllCountByEscalatedUserType(authUser.getId(), EscalationType.L3);
 468 
			size=ticketRepository.selectAllCountByEscalatedUserType(authUser.getId());
471 
				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L3);
 - 
 
472 
				if(tickets.size()>0) {
 469 
			if(tickets.size()>0)
473 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 - 
 
474 
				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 - 
 
475 
				}
 470 
			{
476 
			} else {
 - 
 
477 
				size = ticketRepository.selectAllCountByEscalatedUserType(authUser.getId(), EscalationType.L2);
 - 
 
478 
				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L2);
 - 
 
479 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 471 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
480 
				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 472 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
481 
			}
 473 
			}
482 
		}
 474 
		}
483 
		if (size < limit) {
 475 
		if (size < limit) {
484 
			model.addAttribute("end", offset + size);
 476 
			model.addAttribute("end", offset + size);
485 
		} else {
 477 
		} else {
Line 506... Line 498...
506 
		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 498 
		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
507 
		Map<Integer, List<AuthUser>> authUserListMap = null;
 499 
		Map<Integer, List<AuthUser>> authUserListMap = null;
508 
		List<Ticket> tickets = null;
 500 
		List<Ticket> tickets = null;
509 
		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
 501 
		if (loginDetails.getEmailId().equals("amandeep.singh@smartdukaan.com")) {
510 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
 502 
			tickets = ticketRepository.selectAll(offset, limit, Optional.empty());
511 
			authUserListMap = csService.getAuthUserList(tickets, EscalationType.L4);
 503 
			authUserListMap = csService.getAuthUserList(tickets,authUser);
512 
		} else {
 504 
		} else {
513 
			tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L2, offset, limit);
 - 
 
514 
			if (tickets.size() == 0) {
 505
515 
				tickets = ticketRepository.selectAllByEscalatedUserType(authUser.getId(), EscalationType.L3, offset,
 506 
			tickets=ticketRepository.selectAllByEscalatedUserType(authUser.getId(), offset, limit);
516 
						limit);
 - 
 
517 
				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L3);
 507 
			authUserListMap = csService.getAuthUserList(tickets,authUser);
518 
				LOGGER.info(tickets);
 - 
 
519 
				if(tickets.size()>0)
 508 
				if(tickets.size()>0)
520 
				{
 509 
				{
521 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 510 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
522 
				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 511 
				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
523 
				}
 512 
				}
524 
			} else {
 - 
 
525 
				Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 - 
 
526 
				authUserListMap = csService.getAuthUserList(tickets, EscalationType.L2);
 - 
 
527 
				model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 - 
 
528 
			}
 - 
 
529 
		}
 513 
		}
530 
		model.addAttribute("tickets", tickets);
 514 
		model.addAttribute("tickets", tickets);
531 
		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
 515 
		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
532 
				.getSubCategoryIdAndSubCategoryMap(tickets);
 516 
				.getSubCategoryIdAndSubCategoryMap(tickets);
533 
		model.addAttribute("tickets", tickets);
 517 
		model.addAttribute("tickets", tickets);