| Line 557... |
Line 557... |
| 557 |
if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
|
557 |
if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
|
| 558 |
leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
|
558 |
leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
|
| 559 |
leads.addAll(leadFollowUp);
|
559 |
leads.addAll(leadFollowUp);
|
| 560 |
}
|
560 |
}
|
| 561 |
} else {
|
561 |
} else {
|
| 562 |
if (!leadStatus.contains(LeadStatus.followUp)) {
|
562 |
// Date range selected: return ALL selected statuses (including follow-up) created within [start, end].
|
| 563 |
leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDateAndAuthIds(leadStatus, authUserIds, color, startDateTime, endDateTime);
|
563 |
// Follow-up is now date-bounded via this same query instead of pulling every follow-up ever,
|
| 564 |
}
|
- |
|
| 565 |
if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
|
564 |
// which previously made a date-range download ignore the dates and drop non-follow-up statuses.
|
| 566 |
leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
|
565 |
leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDateAndAuthIds(leadStatus, authUserIds, color, startDateTime, endDateTime);
|
| 567 |
leads.addAll(leadFollowUp);
|
- |
|
| 568 |
}
|
- |
|
| 569 |
}
|
566 |
}
|
| 570 |
} else {
|
567 |
} else {
|
| 571 |
if (startDateTime == null) {
|
568 |
if (startDateTime == null) {
|
| 572 |
if (!leadStatus.contains(LeadStatus.followUp)) {
|
569 |
if (!leadStatus.contains(LeadStatus.followUp)) {
|
| 573 |
leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, LocalDateTime.now().minusMonths(1));
|
570 |
leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, LocalDateTime.now().minusMonths(1));
|
| Line 575... |
Line 572... |
| 575 |
if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
|
572 |
if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
|
| 576 |
leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
|
573 |
leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
|
| 577 |
leads.addAll(leadFollowUp);
|
574 |
leads.addAll(leadFollowUp);
|
| 578 |
}
|
575 |
}
|
| 579 |
} else {
|
576 |
} else {
|
| 580 |
if (!leadStatus.contains(LeadStatus.followUp)) {
|
577 |
// Date range selected: return ALL selected statuses (including follow-up) created within [start, end].
|
| 581 |
leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDate(leadStatus, color, startDateTime, endDateTime);
|
578 |
leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDate(leadStatus, color, startDateTime, endDateTime);
|
| 582 |
}
|
- |
|
| 583 |
if (leadStatus.contains(LeadStatus.followUp)) {
|
- |
|
| 584 |
leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
|
- |
|
| 585 |
leads.addAll(leadFollowUp);
|
- |
|
| 586 |
}
|
- |
|
| 587 |
}
|
579 |
}
|
| 588 |
}
|
580 |
}
|
| 589 |
|
581 |
|
| 590 |
// Build activity map and auth map (SAME AS VIEW ENDPOINT)
|
582 |
// Build activity map and auth map (SAME AS VIEW ENDPOINT)
|
| 591 |
if (!leads.isEmpty()) {
|
583 |
if (!leads.isEmpty()) {
|