diff --git a/src/transaction/dto/export-transaction.dto.ts b/src/transaction/dto/export-transaction.dto.ts index 945b411..e02fb42 100644 --- a/src/transaction/dto/export-transaction.dto.ts +++ b/src/transaction/dto/export-transaction.dto.ts @@ -1,8 +1,9 @@ import { IsNotEmpty, IsOptional } from 'class-validator'; export class ExportTransactionDto { + @IsNotEmpty() + dateStart: string; - @IsNotEmpty() - dateStart: string; - + @IsNotEmpty() + dateEnd: string; } diff --git a/src/transaction/excel.controller.ts b/src/transaction/excel.controller.ts index b3bc43e..b9f99f4 100644 --- a/src/transaction/excel.controller.ts +++ b/src/transaction/excel.controller.ts @@ -30,6 +30,7 @@ export class ExcelController { ) { const result = await this.transactionService.exportDataExcel( exportTransactionDto.dateStart, + exportTransactionDto.dateEnd, id, req.user, ); diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index c57a4c2..9637255 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -2208,7 +2208,7 @@ export class TransactionService { }); } - async exportDataExcel(startDate, user: any, currentUser: any) { + async exportDataExcel(startDate, endDate, user: any, currentUser: any) { const userData = await this.userService.findExist(user); let userBySupperior = []; @@ -2285,7 +2285,7 @@ export class TransactionService { 'transaction.created_at between :startDate and :enDate', { startDate: new Date (`${startDate} 00:00:00`), - enDate: new Date (`${startDate} 23:59:59`), + enDate: new Date (`${endDate} 23:59:59`), }, ); } @@ -2413,7 +2413,7 @@ export class TransactionService { tmp.file( { discardDescriptor: true, - prefix: `Mutasi Transaksi ${userData?.partner.name} ${startDate}`, + prefix: `Mutasi Transaksi ${userData?.partner.name} ${startDate} - ${endDate}`, postfix: '.xlsx', mode: parseInt('0600', 8), },