From 689e17c797bf3844f7b6b6f7c086df9bd8f72a0c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 19:45:34 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/project-template.xml | 98 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 48 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/project-template.xml b/src/main/resources/mybatis/query-template/project-template.xml
index 823b0f3..cd7a94e 100644
--- a/src/main/resources/mybatis/query-template/project-template.xml
+++ b/src/main/resources/mybatis/query-template/project-template.xml
@@ -77,7 +77,7 @@
INNER JOIN user_department ud on ud.department_id = prd.department_id
INNER JOIN workspace ws on ws.id = p.workspace_id
LEFT JOIN project_closure pc ON p.id = pc.project_id
- WHERE 1=1
+ WHERE if (pc.parent_project_id > -1, pc.parent_project_id, -1) = -1
<if test="name != '' and name != null">
AND p.name like CONCAT('%',#{name},'%')
</if>
@@ -181,6 +181,7 @@
INNER JOIN workspace ws on ws.id = p.workspace_id
LEFT JOIN project_closure pc on p.id = pc.project_id
WHERE prd.department_id = ud.id
+ AND if (pc.parent_project_id > -1, pc.parent_project_id, -1) = -1
<if test="name != '' and name != null">
AND p.name like CONCAT('%',#{name},'%')
</if>
@@ -377,43 +378,43 @@
</choose>
</select>
- <!-- <select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
- parameterType="kr.wisestone.owl.web.condition.ProjectCondition">
- SELECT
- DISTINCT p.id as id,
- p.name as name,
- p.description as description,
- p.status as status,
- p.start_date as startDate,
- p.end_date as endDate,
- p.project_key as projectKey,
- CASE p.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
- FROM
- project p
- INNER JOIN project_role pr on p.id = pr.project_id
- INNER JOIN project_role_user pru on pru.project_role_id = pr.id
- WHERE pru.user_id = #{loginUserId}
- AND p.workspace_id = #{workspaceId}
- <if test="name != '' and name != null">
- AND p.name like CONCAT('%',#{name},'%')
- </if>
- <choose>
- <when test="statuses.size != 0">
- AND p.status IN
- <foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- <choose>
- <when test="excludeIds.size != 0">
- AND p.id NOT IN
- <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- </select>-->
+ <!-- <select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
+ parameterType="kr.wisestone.owl.web.condition.ProjectCondition">
+ SELECT
+ DISTINCT p.id as id,
+ p.name as name,
+ p.description as description,
+ p.status as status,
+ p.start_date as startDate,
+ p.end_date as endDate,
+ p.project_key as projectKey,
+ CASE p.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
+ FROM
+ project p
+ INNER JOIN project_role pr on p.id = pr.project_id
+ INNER JOIN project_role_user pru on pru.project_role_id = pr.id
+ WHERE pru.user_id = #{loginUserId}
+ AND p.workspace_id = #{workspaceId}
+ <if test="name != '' and name != null">
+ AND p.name like CONCAT('%',#{name},'%')
+ </if>
+ <choose>
+ <when test="statuses.size != 0">
+ AND p.status IN
+ <foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ <choose>
+ <when test="excludeIds.size != 0">
+ AND p.id NOT IN
+ <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ </select>-->
<!-- �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 吏꾪뻾以묒씤 �봽濡쒖젥�듃瑜� 議고쉶�븳�떎 -->
<select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
@@ -564,6 +565,7 @@
INNER JOIN user_department ud on ud.department_id = prd.department_id
LEFT JOIN project_closure pc ON p.id = pc.project_id
WHERE prd.department_id = ud.department_id
+ AND if (pc.parent_project_id > -1, pc.parent_project_id, -1) = -1
AND p.workspace_id = #{workspaceId}
<if test="name != '' and name != null">
AND p.name like CONCAT('%',#{name},'%')
@@ -623,17 +625,17 @@
<select id="findChildrenProject" resultType="java.util.HashMap" parameterType="long">
SELECT
- p.id as id,
- p.name as name,
- p.description as description,
- p.status as status,
- p.start_date as startDate,
- p.end_date as endDate,
- p.project_key as projectKey,
- pc.parent_project_id as parentProjectId
+ p.id as id,
+ p.name as name,
+ p.description as description,
+ p.status as status,
+ p.start_date as startDate,
+ p.end_date as endDate,
+ p.project_key as projectKey,
+ pc.parent_project_id as parentProjectId
FROM
- project p
- LEFT JOIN project_closure pc ON p.id = pc.project_id
+ project p
+ LEFT JOIN project_closure pc ON p.id = pc.project_id
WHERE pc.parent_project_id = #{parent_project_id}
</select>
--
Gitblit v1.8.0