From 62170f092e8c8031559acf66f54d5abc87cb13cd Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 23 2월 2022 17:44:41 +0900
Subject: [PATCH] 워크플로우 상태 목록 선택 시 상태이름(상태속성) 으로표시되도록 수정 완료
---
src/main/resources/mybatis/query-template/guide-template.xml | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/guide-template.xml b/src/main/resources/mybatis/query-template/guide-template.xml
index 75b976a..f2f69f1 100644
--- a/src/main/resources/mybatis/query-template/guide-template.xml
+++ b/src/main/resources/mybatis/query-template/guide-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.GuideCondition">
+ 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 guide 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.GuideCondition">
+ SELECT
+ count(DISTINCT n.id)
+ FROM guide 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