Subversion Repositories SmartDukaan

Rev

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

Rev 31562 Rev 31563
Line 1551... Line 1551...
1551
		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
1551
		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
1552
 
1552
 
1553
		List<PartnerBillingSummaryModel> partnerBillingSummaryReports = fofoOrderRepository
1553
		List<PartnerBillingSummaryModel> partnerBillingSummaryReports = fofoOrderRepository
1554
				.selectPartnerBillingSummaryReport(fofoDetails.getFofoId(), startDate.atStartOfDay(),
1554
				.selectPartnerBillingSummaryReport(fofoDetails.getFofoId(), startDate.atStartOfDay(),
1555
						endDate.atTime(LocalTime.MAX));
1555
						endDate.atTime(LocalTime.MAX));
1556
		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm");
-
 
1557
 
1556
 
1558
		for (PartnerBillingSummaryModel pbsr : partnerBillingSummaryReports) {
1557
		for (PartnerBillingSummaryModel pbsr : partnerBillingSummaryReports) {
1559
 
1558
 
1560
			rows.add(Arrays.asList(pbsr.getId(),
1559
			rows.add(Arrays.asList(pbsr.getId(),
1561
					dateTimeFormatter.format(pbsr.getCreateTimestamp()),
1560
					FormattingUtils.format(pbsr.getCreateTimestamp()),
1562
					dateTimeFormatter.format(pbsr.getBillingTimestamp()),
1561
					FormattingUtils.format(pbsr.getBillingTimestamp()),
1563
					dateTimeFormatter.format(pbsr.getDeliveryTimestamp()),
1562
					FormattingUtils.format(pbsr.getDeliveryTimestamp()),
1564
					dateTimeFormatter.format(pbsr.getPartnerGrnTimestamp()),
1563
					FormattingUtils.format(pbsr.getPartnerGrnTimestamp()),
1565
					pbsr.getTransactionId(),
1564
					pbsr.getTransactionId(),
1566
					pbsr.getLogisticsTransactionId(), pbsr.getAirwayBillNumber(), pbsr.getStatusSubGroup(),
1565
					pbsr.getLogisticsTransactionId(), pbsr.getAirwayBillNumber(), pbsr.getStatusSubGroup(),
1567
					pbsr.getStatusName(), pbsr.getRetailerId(), pbsr.getRetailerName(), pbsr.getItemId(),
1566
					pbsr.getStatusName(), pbsr.getRetailerId(), pbsr.getRetailerName(), pbsr.getItemId(),
1568
					pbsr.getBrand(), pbsr.getModelName(), pbsr.getModelNumber(), pbsr.getColor(), pbsr.getUnitPrice(),
1567
					pbsr.getBrand(), pbsr.getModelName(), pbsr.getModelNumber(), pbsr.getColor(), pbsr.getUnitPrice(),
1569
					pbsr.getQuantity(), pbsr.getTotalPrice(), pbsr.getInvoiceNumber(), pbsr.getIgstRate(),
1568
					pbsr.getQuantity(), pbsr.getTotalPrice(), pbsr.getInvoiceNumber(), pbsr.getIgstRate(),