Subversion Repositories SmartDukaan

Rev

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

Rev 27652 Rev 27723
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 
			@RequestParam(name = "color", required = false, defaultValue = "") List<String> color, Model model)
68 
			throws Exception {
 68 
			throws Exception {
69 
 
 69 
 
70 
		if (leadStatus.contains(LeadStatus.All)) {
 70 
		if (leadStatus.contains(LeadStatus.All)) {
71 
 
 71 
 
72 
			leadStatus.addAll(Arrays.asList(LeadStatus.values()));
 72 
			leadStatus.addAll(Arrays.asList(LeadStatus.values()));
73 
		}
 73 
		}
74 
 
 74 
 
75 
		List<Lead> leads = null;
 75 
		List<Lead> leads = null;
76 
		Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
 76 
		Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
77 
 
 77 
 
78 
		if (!color.equals("")) {
 78 
		if (!color.isEmpty()) {
- 
 
 79 
			if (color.contains("All")) {
- 
 
 80 
				color.add("yellow");
- 
 
 81 
				color.add("green");
- 
 
 82 
			}
79 
			leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
 83 
			leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
80 
					LocalDateTime.now().withDayOfMonth(1).minusMonths(3));
 84 
					LocalDateTime.now().withDayOfMonth(1).minusMonths(3));
81 
 
 85 
 
82 
		} else {
 86 
		} else {
83 
 
 87 
 
Line 88... Line 92...
88 
			if (!leads.isEmpty()) {
 92 
			if (!leads.isEmpty()) {
89 
				leads.addAll(leadRepository.selectAllByStatus(LeadStatus.pending));
 93 
				leads.addAll(leadRepository.selectAllByStatus(LeadStatus.pending));
90 
			}
 94 
			}
91 
		}
 95 
		}
92 
 
 96 
 
93 
			List<Integer> authIds = new ArrayList<>();
 97 
		List<Integer> authIds = new ArrayList<>();
94 
			if (!leads.isEmpty()) {
 98 
		if (!leads.isEmpty()) {
95 
 
 99 
 
96 
				authIds.addAll(leads.stream().map(x -> x.getAssignTo()).collect(Collectors.toList()));
 100 
			authIds.addAll(leads.stream().map(x -> x.getAssignTo()).collect(Collectors.toList()));
97 
 
 101 
 
98 
				for (Lead lead : leads) {
 102 
			for (Lead lead : leads) {
99 
					List<LeadActivity> leadActivity = leadActivityRepository.selectBYLeadId(lead.getId());
 103 
				List<LeadActivity> leadActivity = leadActivityRepository.selectBYLeadId(lead.getId());
100 
					if (!leadActivity.isEmpty()) {
 104 
				if (!leadActivity.isEmpty()) {
101 
						leadActivityMap.put(lead.getId(), leadActivity.get(0));
 105 
					leadActivityMap.put(lead.getId(), leadActivity.get(0));
102 
					}
 - 
 
103 
				}
 106 
				}
104 
				Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
 - 
 
105 
						.collect(Collectors.toMap(x -> x.getId(), x -> x));
 - 
 
106 
				model.addAttribute("lead", leads);
 - 
 
107 
				model.addAttribute("leadActivityMap", leadActivityMap);
 - 
 
108 
				model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
 - 
 
109 
 
 - 
 
110 
			} else {
 - 
 
111 
				model.addAttribute("lead", leads);
 - 
 
112 
			}
 107 
			}
- 
 
 108 
			Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
- 
 
 109 
					.collect(Collectors.toMap(x -> x.getId(), x -> x));
- 
 
 110 
			model.addAttribute("lead", leads);
- 
 
 111 
			model.addAttribute("leadActivityMap", leadActivityMap);
- 
 
 112 
			model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
- 
 
 113 
 
- 
 
 114 
		} else {
- 
 
 115 
			model.addAttribute("lead", leads);
113
116 
		}
- 
 
 117 
 
114 
		LOGGER.info("leads" + leads);
 118 
		LOGGER.info("leads" + leads);
115 
		List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName())
 119 
		List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName())
116 
				.collect(Collectors.toList());
 120 
				.collect(Collectors.toList());
117 
		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
 121 
		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
118 
		model.addAttribute("stateNames", stateNames);
 122 
		model.addAttribute("stateNames", stateNames);