Subversion Repositories SmartDukaan

Rev

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

Rev 29753 Rev 29852
Line 125... Line 125...
125 
		if (color.contains("All")) {
 125 
		if (color.contains("All")) {
126 
			color.add("yellow");
 126 
			color.add("yellow");
127 
			color.add("green");
 127 
			color.add("green");
128 
		}
 128 
		}
129 
 
 129 
 
130 
		List<Lead> leads = null;
 130 
		List<Lead> leads = new ArrayList<>();
131 
 
 131 
 
132 
		model.addAttribute("colors", color);
 132 
		model.addAttribute("colors", color);
133 
 
 133 
 
134 
		Map<Integer, List<LeadActivity>> leadActivityMap = new HashMap<>();
 134 
		Map<Integer, List<LeadActivity>> leadActivityMap = new HashMap<>();
135 
 
 135 
 
Line 146... Line 146...
146 
 
 146 
 
147 
			LOGGER.info("leadStatus" + leadStatus);
 147 
			LOGGER.info("leadStatus" + leadStatus);
148 
 
 148 
 
149 
			if (localDateTime == null) {
 149 
			if (localDateTime == null) {
150 
 
 150 
 
- 
 
 151 
				if (!leadStatus.contains(LeadStatus.followUp)) {
- 
 
 152 
 
151 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
 153 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
152 
						color, LocalDateTime.now().minusMonths(1));
 154 
							color, LocalDateTime.now().minusMonths(1));
- 
 
 155 
				}
- 
 
 156 
 
- 
 
 157 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
153 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 158 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
154 
				leads.addAll(leadFollowUp);
 159 
					leads.addAll(leadFollowUp);
- 
 
 160 
				}
155 
 
 161 
 
156 
			} else {
 162 
			} else {
- 
 
 163 
 
- 
 
 164 
				if (!leadStatus.contains(LeadStatus.followUp)) {
- 
 
 165 
 
157 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
 166 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
158 
						color, localDateTime);
 167 
							color, localDateTime);
- 
 
 168 
				}
- 
 
 169 
 
- 
 
 170 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
- 
 
 171 
 
159 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 172 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
160 
				leads.addAll(leadFollowUp);
 173 
					leads.addAll(leadFollowUp);
- 
 
 174 
 
- 
 
 175 
				}
161 
 
 176 
 
162 
			}
 177 
			}
163 
 
 178 
 
164 
		} else {
 179 
		} else {
165 
 
 180 
 
166 
			if (localDateTime == null) {
 181 
			if (localDateTime == null) {
- 
 
 182 
				if (!leadStatus.contains(LeadStatus.followUp)) {
167 
 
 183 
 
168 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
 184 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
169 
						LocalDateTime.now().minusMonths(1));
 185 
							LocalDateTime.now().minusMonths(1));
- 
 
 186 
				}
- 
 
 187 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
- 
 
 188 
 
170 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 189 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
171 
				leads.addAll(leadFollowUp);
 190 
					leads.addAll(leadFollowUp);
- 
 
 191 
				}
172 
				LOGGER.info("leadlocalDateTime1" + leads);
 192 
				LOGGER.info("leadlocalDateTime1" + leads);
173 
 
 193 
 
174 
			} else {
 194 
			} else {
- 
 
 195 
				if (!leadStatus.contains(LeadStatus.followUp)) {
- 
 
 196 
 
- 
 
 197 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
- 
 
 198 
				}
- 
 
 199 
 
- 
 
 200 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
175 
 
 201 
 
176 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
 - 
 
177 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 202 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
178 
				leads.addAll(leadFollowUp);
 203 
					leads.addAll(leadFollowUp);
- 
 
 204 
				}
179 
				LOGGER.info("leadlocalDateTime2" + leads);
 205 
				LOGGER.info("leadlocalDateTime2" + leads);
180 
 
 206 
 
181 
			}
 207 
			}
182 
 
 208 
 
183 
		}
 209 
		}