Subversion Repositories SmartDukaan

Rev

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

Rev 29744 Rev 29753
Line 142... Line 142...
142 
		if (authPositon) {
 142 
		if (authPositon) {
143 
			authUserIds = authService.getAllReportees(authUser.getId());
 143 
			authUserIds = authService.getAllReportees(authUser.getId());
144 
			authUserIds.add(authUser.getId());
 144 
			authUserIds.add(authUser.getId());
145 
			LOGGER.info("authIds" + authUserIds);
 145 
			LOGGER.info("authIds" + authUserIds);
146 
 
 146 
 
- 
 
 147 
			LOGGER.info("leadStatus" + leadStatus);
- 
 
 148 
 
147 
			if (localDateTime == null) {
 149 
			if (localDateTime == null) {
148 
 
 150 
 
149 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
 151 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
150 
						color, LocalDateTime.now().minusDays(15));
 152 
						color, LocalDateTime.now().minusMonths(1));
151 
				leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
 153 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
152 
				leads.addAll(leadFollowUp);
 154 
				leads.addAll(leadFollowUp);
153 
 
 155 
 
154 
			} else {
 156 
			} else {
155 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
 157 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
156 
						color, localDateTime);
 158 
						color, localDateTime);
157 
				leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
 159 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
158 
				leads.addAll(leadFollowUp);
 160 
				leads.addAll(leadFollowUp);
159 
 
 161 
 
160 
			}
 162 
			}
161 
 
 163 
 
162 
		} else {
 164 
		} else {
163 
 
 165 
 
164 
			if (localDateTime == null) {
 166 
			if (localDateTime == null) {
165 
 
 167 
 
166 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
 168 
				leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
167 
						LocalDateTime.now().minusDays(15));
 169 
						LocalDateTime.now().minusMonths(1));
168 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
 170 
				leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
169 
				leads.addAll(leadFollowUp);
 171 
				leads.addAll(leadFollowUp);
170 
				LOGGER.info("leadlocalDateTime1" + leads);
 172 
				LOGGER.info("leadlocalDateTime1" + leads);
171 
 
 173 
 
172 
			} else {
 174 
			} else {