Subversion Repositories SmartDukaan

Rev

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

Rev 24750 Rev 24751
Line 351... Line 351...
351 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 351 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
352 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 352 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
353 
			LOGGER.info(ticketStatus);
 353 
			LOGGER.info(ticketStatus);
354 
			LOGGER.info(sortOrder);
 354 
			LOGGER.info(sortOrder);
355 
			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
 355 
			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
356 
					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
 356 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
357 
			size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
 357 
			size = ticketRepository.selectAllCountByAssignee(authUser.getId(),
358 
					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
 358 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
359 
			LOGGER.info(size + "size");
 359 
			LOGGER.info(size + "size");
360 
			ticketAssigneds = ticketAssignedRepository
 360 
			ticketAssigneds = ticketAssignedRepository
361 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
 361 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
362 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 362 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
363 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 363 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
364 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 364 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
365 
 
 365 
 
366 
		} else {
 366 
		} else {
367 
			LOGGER.info(ticketStatus);
 367 
			LOGGER.info(ticketStatus);
368 
			LOGGER.info(sortOrder);
 368 
			LOGGER.info(sortOrder);
369 
			LOGGER.info(TicketStatus.CLOSED.equals(ticketStatus));
 369 
			LOGGER.info(TicketStatus.OPENED.equals(ticketStatus));
370 
			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
 370 
			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
371 
					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
 371 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
372 
			size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(),
 372 
			size = ticketRepository.selectAllCountByCreator(loginDetails.getFofoId(),
373 
					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)));
 373 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)));
374 
		}
 374 
		}
375 
		authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
 375 
		authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
376 
 
 376 
 
377 
		if (size < limit) {
 377 
		if (size < limit) {
378 
			model.addAttribute("end", offset + size);
 378 
			model.addAttribute("end", offset + size);
Line 411... Line 411...
411 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
 411 
		Map<Integer, AuthUser> authUserIdAndAuthUserMap = null;
412 
		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
 412 
		// LOGGER.info(roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))));
413 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
 413 
		if (roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds()))) {
414 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
 414 
			AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
415 
			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
 415 
			tickets = ticketRepository.selectAllByAssignee(authUser.getId(),
416 
					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
 416 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
417 
			ticketAssigneds = ticketAssignedRepository
 417 
			ticketAssigneds = ticketAssignedRepository
418 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
 418 
					.selectByTicketIds(tickets.stream().map(x -> x.getId()).collect(Collectors.toList()));
419 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
 419 
			authUserIdAndAuthUserMap = csService.getAuthUserIdAndAuthUserMap(ticketAssigneds);
420 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
 420 
			Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = csService.getPartnerByFofoIds(tickets);
421 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
 421 
			model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
422 
		} else {
 422 
		} else {
423 
			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
 423 
			tickets = ticketRepository.selectAllByCreator(loginDetails.getFofoId(),
424 
					Optional.of(TicketStatus.CLOSED.equals(ticketStatus)), sortOrder, offset, limit);
 424 
					Optional.of(TicketStatus.OPENED.equals(ticketStatus)), sortOrder, offset, limit);
425 
			authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
 425 
			authUserIdAndAuthUserMap = csService.getTicketIdAndAuthUserMapUsingTickets(tickets);
426 
		}
 426 
		}
427 
		model.addAttribute("roleType", roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds())));
 427 
		model.addAttribute("roleType", roleManager.isAdmin(new HashSet<>(loginDetails.getRoleIds())));
428 
		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
 428 
		Map<Integer, TicketSubCategory> subCategoryIdAndSubCategoryMap = csService
429 
				.getSubCategoryIdAndSubCategoryMap(tickets);
 429 
				.getSubCategoryIdAndSubCategoryMap(tickets);