Subversion Repositories SmartDukaan

Rev

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

Rev 30957 Rev 30960
Line 433... Line 433...
433
						createOfferRequest.getTargetType(), createOfferRequest.getSchemeType(),
433
						createOfferRequest.getTargetType(), createOfferRequest.getSchemeType(),
434
						createOfferRequest.getBrandShareTerms(), createOfferRequest.getSellinPercentage(),
434
						createOfferRequest.getBrandShareTerms(), createOfferRequest.getSellinPercentage(),
435
						createOfferRequest.getPartnerCriteriaString(), createOfferRequest.getItemCriteriaString(),
435
						createOfferRequest.getPartnerCriteriaString(), createOfferRequest.getItemCriteriaString(),
436
						createOfferRequest.getStartDate(), createOfferRequest.getEndDate(),
436
						createOfferRequest.getStartDate(), createOfferRequest.getEndDate(),
437
						createOfferRequest.getCreatedOn(), customRetailer.getPartnerId(), customRetailer.getBusinessName(),
437
						createOfferRequest.getCreatedOn(), customRetailer.getPartnerId(), customRetailer.getBusinessName(),
-
 
438
						customRetailer.getCode(),
-
 
439
 
-
 
440
						offerRowModel.getTotalSale(),
438
						customRetailer.getCode(), offerRowModel.getTotalSale(), offerRowModel.getEligibleSale(),
441
						offerRowModel.getEligibleSale(),
439
						offerRowModel.getAchievedTarget(), offerRowModel.getNextTarget(), offerRowModel.getEligibleSaleDp(),
442
						offerRowModel.getTotalBasePurchaseValue(),
440
						offerRowModel.getTotalBasePurchaseValue(), offerRowModel.getCurrentPayoutTarget(),
443
						offerRowModel.getCurrentPayoutTarget(),
441
						offerRowModel.getPayoutTargetAchieved(), offerRowModel.getPayoutType(),
444
						offerRowModel.getPayoutTargetAchieved(),
-
 
445
						offerRowModel.getPayoutValue(),
-
 
446
						offerRowModel.getPayoutType(),
442
						offerRowModel.getPayoutValue(), offerRowModel.getPayoutValueDp(), offerRowModel.getFinalPayout(),
447
						offerRowModel.getPayoutValueDp(), offerRowModel.getFinalPayout(),
443
						String.join(", ", offerRowModel.getPendingImeis())));
448
						String.join(", ", offerRowModel.getPendingImeis())));
444
			}
449
			}
445
			baos = FileUtil.getCSVByteStream(
450
			baos = FileUtil.getCSVByteStream(
446
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
451
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
447
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
452
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
-
 
453
 
-
 
454
							"Total Value",
-
 
455
							"Eligible Value",
-
 
456
							//"Achieved Target",
-
 
457
							//"Next Target",
448
							"Total Value", "Eligible Value", "Achieved Target", "Next Target", "Eligible Sale DP",
458
							//"Eligible Sale DP",
449
							"Total Purchase DP", "Current Payout Target", "Payout Target Achieved", "Payout Amount Type",
459
							"Total Purchase", "Current Payout Target", "Payout Target Achieved", "Payout Amount", "Payout Amount Type",
450
							"Payout Value", "Payout Value DP", "Amount to be credited", "IMEIs pending for Activation"
460
							"Payout Value DP", "Amount to be credited", "IMEIs pending for Activation"
451
							// "Payout Sale Qty", "Activated Value", "Activated Qty",
461
							// "Payout Sale Qty", "Activated Value", "Activated Qty",
452
					), listOfRows);
462
					), listOfRows);
453
		}
463
		}
454
		final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
464
		final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
455
		final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
465
		final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);