Subversion Repositories SmartDukaan

Rev

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

Rev 27616 Rev 27617
Line 4... Line 4...
4 
import java.util.ArrayList;
 4 
import java.util.ArrayList;
5 
import java.util.Arrays;
 5 
import java.util.Arrays;
6 
import java.util.HashMap;
 6 
import java.util.HashMap;
7 
import java.util.List;
 7 
import java.util.List;
8 
import java.util.Map;
 8 
import java.util.Map;
9 
import java.util.stream.Collector;
 - 
 
10 
import java.util.stream.Collectors;
 9 
import java.util.stream.Collectors;
11 
 
 10 
 
12 
import javax.servlet.http.HttpServletRequest;
 11 
import javax.servlet.http.HttpServletRequest;
13 
import javax.transaction.Transactional;
 12 
import javax.transaction.Transactional;
14 
 
 13 
 
Line 70... Line 69...
70 
		if (leadStatus.contains(LeadStatus.All)) {
 69 
		if (leadStatus.contains(LeadStatus.All)) {
71 
 
 70 
 
72 
			leadStatus.addAll(Arrays.asList(LeadStatus.values()));
 71 
			leadStatus.addAll(Arrays.asList(LeadStatus.values()));
73 
		}
 72 
		}
74 
 
 73 
 
75 
		/*
 - 
 
76 
		 * List<Lead> leads =
 - 
 
77 
		 * leadRepository.selectAllByStatusAndUpdatedTimestamp(status,
 74 
		List<Lead> leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
78 
		 * LocalDateTime.now().withDayOfMonth(1).minusMonths(3));
 75 
				LocalDateTime.now().withDayOfMonth(1).minusMonths(3));
79 
		 */
 76 
 
80 
		List<Lead> leads = leadRepository.selectAllBylistStatus(leadStatus);
 77 
		// List<Lead> leads = leadRepository.selectAllBylistStatus(leadStatus);
81 
		if (!leads.isEmpty()) {
 78 
		if (!leads.isEmpty()) {
82 
			Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
 79 
			Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
83 
			leads.addAll(leadRepository.selectAllByStatus(LeadStatus.pending));
 80 
			leads.addAll(leadRepository.selectAllByStatus(LeadStatus.pending));
84 
			List<Integer> authIds = new ArrayList<>();
 81 
			List<Integer> authIds = new ArrayList<>();
85 
			if (!leads.isEmpty()) {
 82 
			if (!leads.isEmpty()) {