Subversion Repositories SmartDukaan

Rev

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

Rev 27617 Rev 27642
Line 62... Line 62...
62
	List<LeadStatus> status = Arrays.asList(LeadStatus.notInterested, LeadStatus.finalized);
62
	List<LeadStatus> status = Arrays.asList(LeadStatus.notInterested, LeadStatus.finalized);
63
 
63
 
64
	@RequestMapping(value = "/getOpenLead", method = RequestMethod.GET)
64
	@RequestMapping(value = "/getOpenLead", method = RequestMethod.GET)
65
	public String getOpenLead(HttpServletRequest request,
65
	public String getOpenLead(HttpServletRequest request,
66
			@RequestParam(name = "leadStatus", required = false, defaultValue = "followUp") List<LeadStatus> leadStatus,
66
			@RequestParam(name = "leadStatus", required = false, defaultValue = "followUp") List<LeadStatus> leadStatus,
-
 
67
			@RequestParam(name = "color", required = false, defaultValue = "") String color, Model model)
67
			Model model) throws Exception {
68
			throws Exception {
68
 
69
 
69
		if (leadStatus.contains(LeadStatus.All)) {
70
		if (leadStatus.contains(LeadStatus.All)) {
70
 
71
 
71
			leadStatus.addAll(Arrays.asList(LeadStatus.values()));
72
			leadStatus.addAll(Arrays.asList(LeadStatus.values()));
72
		}
73
		}
73
 
74
 
-
 
75
		List<Lead> leads = null;
-
 
76
		Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
-
 
77
 
-
 
78
		if (!color.equals("")) {
-
 
79
			leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
-
 
80
					LocalDateTime.now().withDayOfMonth(1).minusMonths(3));
-
 
81
 
-
 
82
		} else {
-
 
83
 
74
		List<Lead> leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
84
			leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
75
				LocalDateTime.now().withDayOfMonth(1).minusMonths(3));
85
					LocalDateTime.now().withDayOfMonth(1).minusMonths(3));
-
 
86
 
-
 
87
			// List<Lead> leads = leadRepository.selectAllBylistStatus(leadStatus);
-
 
88
			if (!leads.isEmpty()) {
-
 
89
				leads.addAll(leadRepository.selectAllByStatus(LeadStatus.pending));
-
 
90
			}
76
 
91
 
77
		// List<Lead> leads = leadRepository.selectAllBylistStatus(leadStatus);
-
 
78
		if (!leads.isEmpty()) {
-
 
79
			Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
-
 
80
			leads.addAll(leadRepository.selectAllByStatus(LeadStatus.pending));
-
 
81
			List<Integer> authIds = new ArrayList<>();
92
			List<Integer> authIds = new ArrayList<>();
82
			if (!leads.isEmpty()) {
93
			if (!leads.isEmpty()) {
83
 
94
 
84
				authIds.addAll(leads.stream().map(x -> x.getAssignTo()).collect(Collectors.toList()));
95
				authIds.addAll(leads.stream().map(x -> x.getAssignTo()).collect(Collectors.toList()));
85
 
96
 
Line 108... Line 119...
108
		model.addAttribute("lead", leads);
119
		model.addAttribute("lead", leads);
109
		model.addAttribute("leadStatus", LeadStatus.values());
120
		model.addAttribute("leadStatus", LeadStatus.values());
110
 
121
 
111
		model.addAttribute("selectedLeadStatus", leadStatus.get(0));
122
		model.addAttribute("selectedLeadStatus", leadStatus.get(0));
112
		return "lead";
123
		return "lead";
-
 
124
 
113
	}
125
	}
114
 
126
 
115
	@RequestMapping(value = "/getClosedLead", method = RequestMethod.GET)
127
	@RequestMapping(value = "/getClosedLead", method = RequestMethod.GET)
116
	public String getClosedLead(HttpServletRequest request,
128
	public String getClosedLead(HttpServletRequest request,
117
			@RequestParam(name = "offset", defaultValue = "0") int offset,
129
			@RequestParam(name = "offset", defaultValue = "0") int offset,