| Line 765... |
Line 765... |
| 765 |
|
765 |
|
| 766 |
String createdBy = "Partner";
|
766 |
String createdBy = "Partner";
|
| 767 |
Activity firstAct = activityById.get(t.getFirstActivityId());
|
767 |
Activity firstAct = activityById.get(t.getFirstActivityId());
|
| 768 |
if (firstAct != null && firstAct.getCreatedBy() > 0) {
|
768 |
if (firstAct != null && firstAct.getCreatedBy() > 0) {
|
| 769 |
AuthUser u = authUserMap.get(firstAct.getCreatedBy());
|
769 |
AuthUser u = authUserMap.get(firstAct.getCreatedBy());
|
| 770 |
if (u != null) createdBy = (nvl(u.getFirstName()) + " " + nvl(u.getLastName())).trim();
|
770 |
if (u != null) createdBy = u.getFullName();
|
| 771 |
}
|
771 |
}
|
| 772 |
|
772 |
|
| 773 |
String assignedTo = "";
|
773 |
String assignedTo = "";
|
| 774 |
List<AuthUser> assignees = assigneeListMap.get(id);
|
774 |
List<AuthUser> assignees = assigneeListMap.get(id);
|
| 775 |
if (assignees != null && !assignees.isEmpty()) {
|
775 |
if (assignees != null && !assignees.isEmpty()) {
|
| 776 |
assignedTo = assignees.stream()
|
776 |
assignedTo = assignees.stream()
|
| 777 |
.map(u -> (nvl(u.getFirstName()) + " " + nvl(u.getLastName())).trim())
|
777 |
.map(u -> u.getFullName())
|
| 778 |
.collect(Collectors.joining(", "));
|
778 |
.collect(Collectors.joining(", "));
|
| 779 |
} else if (authUserIdMap.get(id) != null) {
|
779 |
} else if (authUserIdMap.get(id) != null) {
|
| 780 |
AuthUser a = authUserIdMap.get(id);
|
780 |
AuthUser a = authUserIdMap.get(id);
|
| 781 |
assignedTo = (nvl(a.getFirstName()) + " " + nvl(a.getLastName())).trim();
|
781 |
assignedTo = a.getFullName();
|
| 782 |
}
|
782 |
}
|
| 783 |
|
783 |
|
| 784 |
String createdTs = t.getFormattedCreateTimestamp() != null ? t.getFormattedCreateTimestamp() : "";
|
784 |
String createdTs = t.getFormattedCreateTimestamp() != null ? t.getFormattedCreateTimestamp() : "";
|
| 785 |
rows.add(Arrays.asList(id, partner, category, subCategory, message, createdBy, assignedTo, createdTs));
|
785 |
rows.add(Arrays.asList(id, partner, category, subCategory, message, createdBy, assignedTo, createdTs));
|
| 786 |
}
|
786 |
}
|
| Line 1028... |
Line 1028... |
| 1028 |
.map(TicketAssigned::getAssineeId)
|
1028 |
.map(TicketAssigned::getAssineeId)
|
| 1029 |
.collect(Collectors.toSet());
|
1029 |
.collect(Collectors.toSet());
|
| 1030 |
authUserIds.addAll(assigneeIds);
|
1030 |
authUserIds.addAll(assigneeIds);
|
| 1031 |
|
1031 |
|
| 1032 |
List<AuthUser> users = authRepository.selectByIds(new ArrayList<>(authUserIds));
|
1032 |
List<AuthUser> users = authRepository.selectByIds(new ArrayList<>(authUserIds));
|
| 1033 |
Map<Integer, String> authUserNameMap = users.stream().collect(Collectors.toMap(AuthUser::getId, x -> x.getFirstName() + " " + x.getLastName()));
|
1033 |
Map<Integer, String> authUserNameMap = users.stream().collect(Collectors.toMap(AuthUser::getId, AuthUser::getFullName));
|
| 1034 |
|
1034 |
|
| 1035 |
// Get current assignee name (most recent assignment)
|
1035 |
// Get current assignee name (most recent assignment)
|
| 1036 |
String currentAssigneeName = null;
|
1036 |
String currentAssigneeName = null;
|
| 1037 |
if (!ticketAssignments.isEmpty()) {
|
1037 |
if (!ticketAssignments.isEmpty()) {
|
| 1038 |
int latestAssigneeId = ticketAssignments.get(ticketAssignments.size() - 1).getAssineeId();
|
1038 |
int latestAssigneeId = ticketAssignments.get(ticketAssignments.size() - 1).getAssineeId();
|