diff --git a/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts b/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
index d42ecb5..39391d5 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
@@ -29,17 +29,19 @@ export default <ReportConfigEntity>{
   column_configs: [
     {
       column: 'main__date',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
+      query: 'main.created_at',
       label: 'Tanggal',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'DD-MM-YYYY',
     },
     {
       column: 'main__time',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
+      query: 'main.created_at',
       label: 'Jam',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'HH:mm',
     },
     {
       column: 'main__drawn_by_name',
diff --git a/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts b/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
index 9672770..077c67f 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
@@ -29,17 +29,19 @@ export default <ReportConfigEntity>{
   column_configs: [
     {
       column: 'main__date',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
+      query: 'main.created_at',
       label: 'Tanggal',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'DD-MM-YYYY',
     },
     {
       column: 'main__time',
-      query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
+      query: 'main.created_at',
       label: 'Jam',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
+      format: DATA_FORMAT.DATE_EPOCH,
+      date_format: 'HH:mm',
     },
     {
       column: 'main__type',