| Line 1555... |
Line 1555... |
| 1555 |
endDate.atTime(LocalTime.MAX));
|
1555 |
endDate.atTime(LocalTime.MAX));
|
| 1556 |
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm");
|
1556 |
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm");
|
| 1557 |
|
1557 |
|
| 1558 |
for (PartnerBillingSummaryModel pbsr : partnerBillingSummaryReports) {
|
1558 |
for (PartnerBillingSummaryModel pbsr : partnerBillingSummaryReports) {
|
| 1559 |
|
1559 |
|
| 1560 |
rows.add(Arrays.asList(pbsr.getId(), pbsr.getCreateTimestamp().format(dateTimeFormatter),
|
1560 |
rows.add(Arrays.asList(pbsr.getId(),
|
| 1561 |
pbsr.getBillingTimestamp().format(dateTimeFormatter),
|
1561 |
dateTimeFormatter.format(pbsr.getCreateTimestamp()),
|
| 1562 |
pbsr.getDeliveryTimestamp().format(dateTimeFormatter),
|
1562 |
dateTimeFormatter.format(pbsr.getBillingTimestamp()),
|
| 1563 |
pbsr.getDeliveryTimestamp().format(dateTimeFormatter),
|
1563 |
dateTimeFormatter.format(pbsr.getDeliveryTimestamp()),
|
| 1564 |
pbsr.getPartnerGrnTimestamp().format(dateTimeFormatter), pbsr.getTransactionId(),
|
1564 |
dateTimeFormatter.format(pbsr.getPartnerGrnTimestamp()),
|
| - |
|
1565 |
pbsr.getTransactionId(),
|
| 1565 |
pbsr.getLogisticsTransactionId(), pbsr.getAirwayBillNumber(), pbsr.getStatusSubGroup(),
|
1566 |
pbsr.getLogisticsTransactionId(), pbsr.getAirwayBillNumber(), pbsr.getStatusSubGroup(),
|
| 1566 |
pbsr.getStatusName(), pbsr.getRetailerId(), pbsr.getRetailerName(), pbsr.getItemId(),
|
1567 |
pbsr.getStatusName(), pbsr.getRetailerId(), pbsr.getRetailerName(), pbsr.getItemId(),
|
| 1567 |
pbsr.getBrand(), pbsr.getModelName(), pbsr.getModelNumber(), pbsr.getColor(), pbsr.getUnitPrice(),
|
1568 |
pbsr.getBrand(), pbsr.getModelName(), pbsr.getModelNumber(), pbsr.getColor(), pbsr.getUnitPrice(),
|
| 1568 |
pbsr.getQuantity(), pbsr.getTotalPrice(), pbsr.getInvoiceNumber(), pbsr.getIgstRate(),
|
1569 |
pbsr.getQuantity(), pbsr.getTotalPrice(), pbsr.getInvoiceNumber(), pbsr.getIgstRate(),
|
| 1569 |
pbsr.getCgstRate(), pbsr.getSgstRate()));
|
1570 |
pbsr.getCgstRate(), pbsr.getSgstRate()));
|
| 1570 |
|
1571 |
|
| 1571 |
}
|
1572 |
}
|
| 1572 |
|
1573 |
|
| 1573 |
org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("OrderId",
|
1574 |
org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("OrderId",
|
| 1574 |
"CREATION_DATE", "BILLING_DATE", "DELIVERED_ON", "SCANNED_IN_ON", "Transaction_id", "master_order_id",
|
1575 |
"Created On", "Billed On", "Delivered On", "Grned On", "Transaction_id", "master_order_id",
|
| 1575 |
"airwaybill_no", "statusSubGroupp", "statusName", "customer_id", "customer_name", "Item_Id", "brand",
|
1576 |
"airwaybill_no", "statusSubGroupp", "statusName", "customer_id", "customer_name", "Item_Id", "brand",
|
| 1576 |
"model_name", "model_number", "color", "selling_price", "Quantity", "total_price", "invoice_number",
|
1577 |
"model_name", "model_number", "color", "selling_price", "Quantity", "total_price", "invoice_number",
|
| 1577 |
"igstrate", "cgstrate", "sgstrate"), rows);
|
1578 |
"igstrate", "cgstrate", "sgstrate"), rows);
|
| 1578 |
|
1579 |
|
| 1579 |
ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Billing Statement Report");
|
1580 |
ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Billing Statement Report");
|