Subversion Repositories SmartDukaan

Rev

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

Rev 31700 Rev 31778
Line 430... Line 430...
430
			}
430
			}
431
			baos = FileUtil.getCSVByteStream(
431
			baos = FileUtil.getCSVByteStream(
432
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
432
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
433
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
433
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
434
							"Base Purchase", "Achieved Target", "Eligible Purchase", "Slab Amount", "Slab Amount Type", "Payout Value(Rs.)",
434
							"Base Purchase", "Achieved Target", "Eligible Purchase", "Slab Amount", "Slab Amount Type", "Payout Value(Rs.)",
435
							"Eligible IMEIs"
435
							"Eligible IMEIs", "Billing Pending Imeis"
436
					), listOfRows);
436
					), listOfRows);
437
		} else {
437
		} else {
438
			for (OfferRowModel offerRowModel : offerRowModels) {
438
			for (OfferRowModel offerRowModel : offerRowModels) {
439
				CustomRetailer customRetailer = retailerService.getFofoRetailer(offerRowModel.getFofoId());
439
				CustomRetailer customRetailer = retailerService.getFofoRetailer(offerRowModel.getFofoId());
440
				listOfRows.add(Arrays.asList(createOfferRequest.getId(), createOfferRequest.getName(),
440
				listOfRows.add(Arrays.asList(createOfferRequest.getId(), createOfferRequest.getName(),
Line 449... Line 449...
449
						offerRowModel.getEligibleSale(),
449
						offerRowModel.getEligibleSale(),
450
						offerRowModel.getPayoutTargetAchieved(),
450
						offerRowModel.getPayoutTargetAchieved(),
451
						offerRowModel.getPayoutValue(),
451
						offerRowModel.getPayoutValue(),
452
						offerRowModel.getPayoutType(),
452
						offerRowModel.getPayoutType(),
453
						offerRowModel.getPayoutValueDp(), offerRowModel.getFinalPayout(),
453
						offerRowModel.getPayoutValueDp(), offerRowModel.getFinalPayout(),
454
						String.join(", ", offerRowModel.getEligibleImeis())));
454
						String.join(", ", offerRowModel.getEligibleImeis()),
-
 
455
						String.join(", ", offerRowModel.getBaseCriteria()))
-
 
456
				);
455
			}
457
			}
456
			baos = FileUtil.getCSVByteStream(
458
			baos = FileUtil.getCSVByteStream(
457
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
459
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
458
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
460
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
459
 
461