Subversion Repositories SmartDukaan

Rev

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

Rev 34890 Rev 34894
Line 235... Line 235...
235
                LOGGER.info("leadlocalDateTime1" + leads);
235
                LOGGER.info("leadlocalDateTime1" + leads);
236
 
236
 
237
            } else {
237
            } else {
238
                if (!leadStatus.contains(LeadStatus.followUp)) {
238
                if (!leadStatus.contains(LeadStatus.followUp)) {
239
 
239
 
240
                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
240
                    leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, localDateTime);
241
                }
241
                }
242
 
242
 
243
                if (leadStatus.contains(LeadStatus.followUp)) {
243
                if (leadStatus.contains(LeadStatus.followUp)) {
244
 
244
 
245
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
245
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
Line 511... Line 511...
511
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
511
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
512
                    leads.addAll(leadFollowUp);
512
                    leads.addAll(leadFollowUp);
513
                }
513
                }
514
            } else {
514
            } else {
515
                if (!leadStatus.contains(LeadStatus.followUp)) {
515
                if (!leadStatus.contains(LeadStatus.followUp)) {
516
                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
516
                    leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, localDateTime);
517
                }
517
                }
518
                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
518
                if (leadStatus.contains(LeadStatus.followUp)) {
519
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
519
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
520
                    leads.addAll(leadFollowUp);
520
                    leads.addAll(leadFollowUp);
521
                }
521
                }
522
            }
522
            }
523
        }
523
        }