Subversion Repositories SmartDukaan

Rev

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

Rev 29448 Rev 29450
Line 104... Line 104...
104
			@RequestParam(name = "color", required = false, defaultValue = "") List<String> color,
104
			@RequestParam(name = "color", required = false, defaultValue = "") List<String> color,
105
			@RequestParam(name = "leadDate", required = false, defaultValue = "") LocalDate leadDate, Model model)
105
			@RequestParam(name = "leadDate", required = false, defaultValue = "") LocalDate leadDate, Model model)
106
			throws Exception {
106
			throws Exception {
107
 
107
 
108
		LocalDateTime localDateTime = null;
108
		LocalDateTime localDateTime = null;
-
 
109
		
-
 
110
		
109
 
111
 
110
		LOGGER.info("color" + color);
112
		LOGGER.info("color" + color);
111
 
113
 
112
		LOGGER.info("leadDate" + leadDate);
114
		LOGGER.info("leadDate" + leadDate);
113
 
115
 
Line 157... Line 159...
157
 
159
 
158
				if (leadStatus.contains(LeadStatus.All)) {
160
				if (leadStatus.contains(LeadStatus.All)) {
159
					if (localDateTime == null) {
161
					if (localDateTime == null) {
160
 
162
 
161
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
163
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
162
								authUserIds, color, LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1));
164
								authUserIds, color, LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
163
 
165
 
164
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
166
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
165
 
167
 
166
						leads.addAll(leadFollowUp);
168
						leads.addAll(leadFollowUp);
167
 
169
 
Line 181... Line 183...
181
 
183
 
182
				{
184
				{
183
					if (localDateTime == null) {
185
					if (localDateTime == null) {
184
 
186
 
185
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
187
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
186
								authUserIds, color, LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1));
188
								authUserIds, color, LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
187
 
189
 
188
					} else {
190
					} else {
189
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
191
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus,
190
								authUserIds, color, localDateTime);
192
								authUserIds, color, localDateTime);
191
 
193
 
Line 200... Line 202...
200
				if (leadStatus.contains(LeadStatus.All)) {
202
				if (leadStatus.contains(LeadStatus.All)) {
201
 
203
 
202
					if (localDateTime == null) {
204
					if (localDateTime == null) {
203
 
205
 
204
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
206
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
205
								LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1));
207
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
206
 
208
 
207
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
209
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
208
						leads.addAll(leadFollowUp);
210
						leads.addAll(leadFollowUp);
209
						LOGGER.info("leadlocalDateTime1" + leads);
211
						LOGGER.info("leadlocalDateTime1" + leads);
210
 
212
 
Line 221... Line 223...
221
				else {
223
				else {
222
 
224
 
223
					if (localDateTime == null) {
225
					if (localDateTime == null) {
224
 
226
 
225
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
227
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
226
								LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1));
228
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
227
 
229
 
228
						LOGGER.info("leadlocalDateTime3" + leads);
230
						LOGGER.info("leadlocalDateTime3" + leads);
229
					} else {
231
					} else {
230
 
232
 
231
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
233
						leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
Line 244... Line 246...
244
				LOGGER.info("authIds" + authUserIds);
246
				LOGGER.info("authIds" + authUserIds);
245
				if (leadStatus.contains(LeadStatus.All)) {
247
				if (leadStatus.contains(LeadStatus.All)) {
246
					if (localDateTime == null) {
248
					if (localDateTime == null) {
247
 
249
 
248
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
250
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
249
								LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1), authUserIds);
251
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1), authUserIds);
250
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
252
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
251
						leads.addAll(leadFollowUp);
253
						leads.addAll(leadFollowUp);
252
						LOGGER.info("leadlocalDateTime1" + leads);
254
						LOGGER.info("leadlocalDateTime1" + leads);
253
					}
255
					}
254
 
256
 
Line 265... Line 267...
265
 
267
 
266
				else {
268
				else {
267
 
269
 
268
					if (localDateTime == null) {
270
					if (localDateTime == null) {
269
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
271
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus,
270
								LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1), authUserIds);
272
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1), authUserIds);
271
					}
273
					}
272
 
274
 
273
					else {
275
					else {
274
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus, localDateTime,
276
						leads = leadRepository.selectAllByStatusAndUpdatedTimestampAndAuthId(leadStatus, localDateTime,
275
								authUserIds);
277
								authUserIds);
Line 282... Line 284...
282
				if (leadStatus.contains(LeadStatus.All)) {
284
				if (leadStatus.contains(LeadStatus.All)) {
283
 
285
 
284
					if (localDateTime == null) {
286
					if (localDateTime == null) {
285
 
287
 
286
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
288
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
287
								LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1));
289
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
288
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
290
						List<Lead> leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
289
						leads.addAll(leadFollowUp);
291
						leads.addAll(leadFollowUp);
290
						LOGGER.info("leadlocalDateTime1" + leads);
292
						LOGGER.info("leadlocalDateTime1" + leads);
291
 
293
 
292
					}
294
					}
Line 303... Line 305...
303
				else {
305
				else {
304
 
306
 
305
					if (localDateTime == null) {
307
					if (localDateTime == null) {
306
 
308
 
307
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
309
						leads = leadRepository.selectAllByStatusAndUpdatedTimestamp(leadStatus,
308
								LocalDate.now().atStartOfDay().withDayOfMonth(1).minusMonths(1));
310
								LocalDateTime.now().withDayOfMonth(1).minusMonths(1));
309
 
311
 
310
						LOGGER.info("manish!233" + leads);
312
						
311
 
313
 
312
					}
314
					}
313
 
315
 
314
					else {
316
					else {
315
 
317