From 5996786ac1e76645be752a9971ad75ee2fe730d7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 15 2월 2022 10:40:00 +0900
Subject: [PATCH] - 탐지일시가 제대로 검색되지 않는 문제 해결 - 이슈 테이블 표시 설정 시 팝업 타이밍 수정

---
 src/main/resources/mybatis/query-template/faq-template.xml |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mybatis/query-template/faq-template.xml b/src/main/resources/mybatis/query-template/faq-template.xml
index 3da048a..9305d29 100644
--- a/src/main/resources/mybatis/query-template/faq-template.xml
+++ b/src/main/resources/mybatis/query-template/faq-template.xml
@@ -18,7 +18,7 @@
         <if test="title != '' and title != null">
             AND n.title like CONCAT('%',#{title},'%')
         </if>
-        ORDER BY ID DESC
+        ORDER BY n.register_date DESC
         <if test="page != null and !page.equals('')">
             limit #{pageSize} offset #{page};
         </if>
@@ -34,4 +34,37 @@
         </if>
     </select>
 
+    <select id="findNotActivation" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.FaqCondition">
+        SELECT
+        DISTINCT n.id as id,
+        n.title as title,
+        n.description as description,
+        n.register_id as registerId,
+        n.status as status,
+        u.name as writer,
+        SUBSTRING (n.register_date, 1, 10) as registerDate
+        FROM faq n
+        INNER JOIN user u on u.id = n.register_id
+        WHERE 1=1
+        AND n.status > 0
+        <if test="title != '' and title != null">
+            AND n.title like CONCAT('%',#{title},'%')
+        </if>
+        ORDER BY n.register_date DESC
+        <if test="page != null and !page.equals('')">
+            limit #{pageSize} offset #{page};
+        </if>
+    </select>
+
+    <select id="countNotActivation" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.FaqCondition">
+        SELECT
+        count(DISTINCT n.id)
+        FROM faq n
+        WHERE 1=1
+        AND n.status > 0
+        <if test="title != '' and title != null">
+            AND n.title like CONCAT('%',#{title},'%')
+        </if>
+    </select>
+
 </mapper>

--
Gitblit v1.8.0