Subversion Repositories SmartDukaan

Rev

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

Rev 30185 Rev 30290
Line 158... Line 158...
158 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
 158 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
159 
							color, LocalDateTime.now().minusMonths(1));
 159 
							color, LocalDateTime.now().minusMonths(1));
160 
				}
 160 
				}
161 
 
 161 
 
162 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
 162 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
163 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 163 
					leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
164 
					leads.addAll(leadFollowUp);
 164 
					leads.addAll(leadFollowUp);
165 
				}
 165 
				}
166 
 
 166 
 
167 
			} else {
 167 
			} else {
168 
 
 168 
 
Line 172... Line 172...
172 
							color, localDateTime);
 172 
							color, localDateTime);
173 
				}
 173 
				}
174 
 
 174 
 
175 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
 175 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
176 
 
 176 
 
177 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 177 
					leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
- 
 
 178 
 
178 
					leads.addAll(leadFollowUp);
 179 
					leads.addAll(leadFollowUp);
179 
 
 180 
 
180 
				}
 181 
				}
181 
 
 182 
 
182 
			}
 183 
			}
Line 189... Line 190...
189 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
 190 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
190 
							LocalDateTime.now().minusMonths(1));
 191 
							LocalDateTime.now().minusMonths(1));
191 
				}
 192 
				}
192 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
 193 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
193 
 
 194 
 
194 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 195 
					leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
- 
 
 196 
 
195 
					leads.addAll(leadFollowUp);
 197 
					leads.addAll(leadFollowUp);
196 
				}
 198 
				}
197 
				LOGGER.info("leadlocalDateTime1" + leads);
 199 
				LOGGER.info("leadlocalDateTime1" + leads);
198 
 
 200 
 
199 
			} else {
 201 
			} else {
Line 202... Line 204...
202 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
 204 
					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
203 
				}
 205 
				}
204 
 
 206 
 
205 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
 207 
				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
206 
 
 208 
 
207 
					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 209 
					leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
- 
 
 210 
 
208 
					leads.addAll(leadFollowUp);
 211 
					leads.addAll(leadFollowUp);
209 
				}
 212 
				}
210 
				LOGGER.info("leadlocalDateTime2" + leads);
 213 
				LOGGER.info("leadlocalDateTime2" + leads);
211 
 
 214 
 
212 
			}
 215 
			}