Subversion Repositories SmartDukaan

Rev

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

Rev 33244 Rev 33778
Line 668... Line 668...
668
 
668
 
669
        Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
669
        Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
670
 
670
 
671
        List<Integer> ticketIds = tickets.stream().map(x -> x.getId()).collect(Collectors.toList());
671
        List<Integer> ticketIds = tickets.stream().map(x -> x.getId()).collect(Collectors.toList());
672
        Map<Integer, List<Activity>> activityMap = new HashMap<>();
672
        Map<Integer, List<Activity>> activityMap = new HashMap<>();
-
 
673
        Map<Integer, List<Activity>> activityMapWithActivityId = new HashMap<>();
673
 
674
 
674
        if (!ticketIds.isEmpty()) {
675
        if (!ticketIds.isEmpty()) {
675
            activityMap = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getTicketId()));
676
            activityMap = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getTicketId()));
-
 
677
            activityMapWithActivityId = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getId()));
676
 
678
 
677
        }
679
        }
-
 
680
 
-
 
681
        List<AuthUser> authUsersList = authRepository.selectAll();
-
 
682
        Map<Integer, AuthUser> authUserMap = authUsersList.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-
 
683
 
678
        model.addAttribute("ticketStatusValues", TicketStatus.values());
684
        model.addAttribute("ticketStatusValues", TicketStatus.values());
679
        model.addAttribute("orderByValues", SortOrder.values());
685
        model.addAttribute("orderByValues", SortOrder.values());
680
        model.addAttribute("selectedticketStatus", ticketStatus);
686
        model.addAttribute("selectedticketStatus", ticketStatus);
681
        model.addAttribute("selectedorderby", sortOrder);
687
        model.addAttribute("selectedorderby", sortOrder);
682
        model.addAttribute("tickets", tickets);
688
        model.addAttribute("tickets", tickets);
Line 687... Line 693...
687
        model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
693
        model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
688
 
694
 
689
        model.addAttribute("subCategoryIdAndCategoryMap", subCategoryIdAndCategoryMap);
695
        model.addAttribute("subCategoryIdAndCategoryMap", subCategoryIdAndCategoryMap);
690
 
696
 
691
        model.addAttribute("activityMap", activityMap);
697
        model.addAttribute("activityMap", activityMap);
-
 
698
        model.addAttribute("authUserMap", authUserMap);
-
 
699
        model.addAttribute("activityMapWithActivityId", activityMapWithActivityId);
692
 
700
 
693
        return "managerTicket";
701
        return "managerTicket";
694
    }
702
    }
695
 
703
 
696
 
704