Subversion Repositories SmartDukaan

Rev

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

Rev 29476 Rev 29479
Line 159... Line 159...
159 
 
 159 
 
160 
				if (leadStatus.contains(LeadStatus.All)) {
 160 
				if (leadStatus.contains(LeadStatus.All)) {
161 
					if (localDateTime == null) {
 161 
					if (localDateTime == null) {
162 
 
 162 
 
163 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
 163 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
164 
								authUserIds, color, LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
 164 
								authUserIds, color, LocalDateTime.now().minusMonths(1));
165 
 
 165 
 
166 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 166 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
167 
 
 167 
 
168 
						leads.addAll(leadFollowUp);
 168 
						leads.addAll(leadFollowUp);
169 
 
 169 
 
Line 183... Line 183...
183 
 
 183 
 
184 
				{
 184 
				{
185 
					if (localDateTime == null) {
 185 
					if (localDateTime == null) {
186 
 
 186 
 
187 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
 187 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
188 
								authUserIds, color, LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
 188 
								authUserIds, color, LocalDateTime.now().minusMonths(1));
189 
 
 189 
 
190 
					} else {
 190 
					} else {
191 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
 191 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
192 
								authUserIds, color, localDateTime);
 192 
								authUserIds, color, localDateTime);
193 
 
 193 
 
Line 202... Line 202...
202 
				if (leadStatus.contains(LeadStatus.All)) {
 202 
				if (leadStatus.contains(LeadStatus.All)) {
203 
 
 203 
 
204 
					if (localDateTime == null) {
 204 
					if (localDateTime == null) {
205 
 
 205 
 
206 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
 206 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
207 
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
 207 
								LocalDateTime.now().minusMonths(1));
208 
 
 208 
 
209 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 209 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
210 
						leads.addAll(leadFollowUp);
 210 
						leads.addAll(leadFollowUp);
211 
						LOGGER.info("leadlocalDateTime1" + leads);
 211 
						LOGGER.info("leadlocalDateTime1" + leads);
212 
 
 212 
 
Line 223... Line 223...
223 
				else {
 223 
				else {
224 
 
 224 
 
225 
					if (localDateTime == null) {
 225 
					if (localDateTime == null) {
226 
 
 226 
 
227 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
 227 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
228 
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
 228 
								LocalDateTime.now().minusMonths(1));
229 
 
 229 
 
230 
						LOGGER.info("leadlocalDateTime3" + leads);
 230 
						LOGGER.info("leadlocalDateTime3" + leads);
231 
					} else {
 231 
					} else {
232 
 
 232 
 
233 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
 233 
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
Line 246... Line 246...
246 
				LOGGER.info("authIds" + authUserIds);
 246 
				LOGGER.info("authIds" + authUserIds);
247 
				if (leadStatus.contains(LeadStatus.All)) {
 247 
				if (leadStatus.contains(LeadStatus.All)) {
248 
					if (localDateTime == null) {
 248 
					if (localDateTime == null) {
249 
 
 249 
 
250 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
 250 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
251 
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1), authUserIds);
 251 
								LocalDateTime.now().minusMonths(1), authUserIds);
252 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 252 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
253 
						leads.addAll(leadFollowUp);
 253 
						leads.addAll(leadFollowUp);
254 
						LOGGER.info("leadlocalDateTime1" + leads);
 254 
						LOGGER.info("leadlocalDateTime1" + leads);
255 
					}
 255 
					}
256 
 
 256 
 
Line 267... Line 267...
267 
 
 267 
 
268 
				else {
 268 
				else {
269 
 
 269 
 
270 
					if (localDateTime == null) {
 270 
					if (localDateTime == null) {
271 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
 271 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
272 
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1), authUserIds);
 272 
								LocalDateTime.now().minusMonths(1), authUserIds);
273 
					}
 273 
					}
274 
 
 274 
 
275 
					else {
 275 
					else {
276 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus, localDateTime,
 276 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus, localDateTime,
277 
								authUserIds);
 277 
								authUserIds);
Line 284... Line 284...
284 
				if (leadStatus.contains(LeadStatus.All)) {
 284 
				if (leadStatus.contains(LeadStatus.All)) {
285 
 
 285 
 
286 
					if (localDateTime == null) {
 286 
					if (localDateTime == null) {
287 
 
 287 
 
288 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
 288 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
289 
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
 289 
								LocalDateTime.now().minusMonths(1));
290 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 290 
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
291 
						leads.addAll(leadFollowUp);
 291 
						leads.addAll(leadFollowUp);
292 
						LOGGER.info("leadlocalDateTime1" + leads);
 292 
						LOGGER.info("leadlocalDateTime1" + leads);
293 
 
 293 
 
294 
					}
 294 
					}
Line 305... Line 305...
305 
				else {
 305 
				else {
306 
 
 306 
 
307 
					if (localDateTime == null) {
 307 
					if (localDateTime == null) {
308 
 
 308 
 
309 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
 309 
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
310 
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
 310 
								LocalDateTime.now().minusMonths(1));
311 
 
 311 
 
312
312
313 
 
 313 
 
314 
					}
 314 
					}
315 
 
 315