Subversion Repositories SmartDukaan

Rev

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

Rev 30385 Rev 30386
Line 420... Line 420...
420
		headers.set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
420
		headers.set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
421
		headers.set("Content-disposition",
421
		headers.set("Content-disposition",
422
				"inline; filename=pricedrop-" + item.getItemDescriptionNoColor().replaceAll("\\s?,\\s?", " ") + "-"
422
				"inline; filename=pricedrop-" + item.getItemDescriptionNoColor().replaceAll("\\s?,\\s?", " ") + "-"
423
						+ FormattingUtils.formatDate(priceDrop.getAffectedOn()) + ".csv");
423
						+ FormattingUtils.formatDate(priceDrop.getAffectedOn()) + ".csv");
424
		ByteArrayOutputStream baos = null;
424
		ByteArrayOutputStream baos = null;
425
		if (priceDropIMEIsMap.size() == 0 && priceDrop.getProcessTimestamp() == null) {
-
 
426
			priceDrop.setProcessTimestamp(LocalDateTime.now());
-
 
427
		} else if (priceDropIMEIsMap.size() == 0) {
425
		if (priceDropIMEIsMap.size() == 0) {
428
			priceDropService.priceDropStatus(priceDrop.getId());
426
			priceDropService.priceDropStatus(priceDrop.getId());
429
			baos = FileUtil.getCSVByteStream(Arrays.asList("IMEI Number", "Store Name", "Store Code", "Item ID", "Brand",
427
			baos = FileUtil.getCSVByteStream(Arrays.asList("IMEI Number", "Store Name", "Store Code", "Item ID", "Brand",
430
					"Model Name", "Model Number", "Color", "Status", "Rejection Reason", "Last Scanned", "Vendor Name",
428
					"Model Name", "Model Number", "Color", "Status", "Rejection Reason", "Last Scanned", "Vendor Name",
431
					"Grn On", "Activation Timestamp", "Activation Added On"), new ArrayList<>());
429
					"Grn On", "Activation Timestamp", "Activation Added On"), new ArrayList<>());
432
		} else {
430
		} else {