(최겸) 구매 협력업체 정기평가, 가입승인, 기본계약 리비전 등

2 files changed, 6 insertions, 9 deletions

diff --git a/lib/evaluation-criteria/service.ts b/lib/evaluation-criteria/service.ts
index 9cb0126f..9288e05c 100644
--- a/lib/evaluation-criteria/service.ts
+++ b/lib/evaluation-criteria/service.ts
@@ -82,11 +82,10 @@ async function getRegEvalCriteria(input: GetRegEvalCriteriaSchema) {
     // Sorting

     const orderBy = input.sort.length > 0

       ? input.sort.map((item) => {

-          return item.desc

-            ? desc(regEvalCriteria[item.id])

-            : asc(regEvalCriteria[item.id]);

+          const column = regEvalCriteria[item.id];

+          return item.desc ? desc(column) : asc(column);

         })

-      : [asc(regEvalCriteria.id)];

+      : [desc(regEvalCriteria.createdAt)];

 

     // Getting Data - 메인 기준 데이터만 가져오기

     const { data, total } = await db.transaction(async (tx) => {

diff --git a/lib/evaluation-criteria/table/reg-eval-criteria-table.tsx b/lib/evaluation-criteria/table/reg-eval-criteria-table.tsx
index e2d614e0..86a22eaf 100644
--- a/lib/evaluation-criteria/table/reg-eval-criteria-table.tsx
+++ b/lib/evaluation-criteria/table/reg-eval-criteria-table.tsx
@@ -94,6 +94,8 @@ function RegEvalCriteriaTable({ promises }: RegEvalCriteriaTableProps) {
       ] 
     },
     { id: 'remarks', label: '비고', type: 'text' },
+    { id: 'createdAt', label: '생성일', type: 'date' },
+    { id: 'updatedAt', label: '수정일', type: 'date' },
   ];
 
   // Data Table Setting
@@ -105,14 +107,10 @@ function RegEvalCriteriaTable({ promises }: RegEvalCriteriaTableProps) {
     enablePinning: true,
     enableAdvancedFilter: true,
     initialState: {
-      sorting: [
-        { id: 'id', desc: false },
-      ],
+      sorting: [{ id: "createdAt", desc: true }],
       columnPinning: { left: ['select'], right: ['actions'] },
       columnVisibility: {
         id: false,
-        createdAt: false,
-        updatedAt: false,
         createdBy: false,
         updatedBy: false,
         variableScoreMin: false,