From 178ec32fd4ca26d82119ad161b1ad657b01d2c20 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 20:23:51 +0900
Subject: [PATCH] 대시보드 이슈 클릭시 이슈 상세로 이동 수정

---
 src/main/resources/mybatis/query-template/issue-template.xml  |    4 +++-
 src/main/webapp/scripts/app/common/common.controller.js       |    5 +++--
 src/main/resources/mybatis/query-template/widget-template.xml |   18 +++++++++++++-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index a86525d..6916ce6 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -196,7 +196,9 @@
                 </foreach>
             </when>
         </choose>
-        AND issue.parent_issue_id IS NULL
+        <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
+            AND issue.parent_issue_id IS NULL
+        </if>
         AND issue.reverse_index <![CDATA[ < ]]> 0
         AND workspace.id = #{workspaceId}
         GROUP BY issue.id
diff --git a/src/main/resources/mybatis/query-template/widget-template.xml b/src/main/resources/mybatis/query-template/widget-template.xml
index 4b94ec0..26365cf 100644
--- a/src/main/resources/mybatis/query-template/widget-template.xml
+++ b/src/main/resources/mybatis/query-template/widget-template.xml
@@ -695,6 +695,7 @@
         select
         distinct i.id as id,
         i.title as title,
+        i.issue_type_id as issueTypeId,
         p.name as projectName,
         CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
         p.project_key as projectKey,
@@ -815,7 +816,8 @@
         CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
         i.issue_number as issueNumber,
         p.project_key as projectKey,
-        p.name as projectName
+        p.name as projectName,
+        i.issue_type_id as issueTypeId
         from issue i
         inner join issue_risk ir on ir.issue_id = i.id
         inner join issue_status iss on iss.id = i.issue_status_id
@@ -874,6 +876,7 @@
             , i.issue_number as issueNumber
             , p.project_key as projectKey
             , CONCAT(p.project_key, '-', i.issue_number) AS issueKey
+            , i.issue_type_id as issueTypeId
         </if>
         FROM issue i
         <if test="page != null and !page.equals('')">
@@ -943,6 +946,7 @@
             , iss.name as issueStatusName
             , i.issue_number as issueNumber
             , p.project_key as projectKey
+            , i.issue_type_id as issueTypeId
             , CONCAT(p.project_key, '-', i.issue_number) AS issueKey
         </if>
         FROM issue i
@@ -1009,7 +1013,8 @@
             </when>
         </choose>
         ,p.id,
-        p.name as projectName
+        p.name as projectName,
+        i.issue_type_id as issueTypeId
         from issue i
         inner join project p on p.id = i.project_id
         inner join issue_status iss on iss.id = i.issue_status_id
@@ -1036,7 +1041,8 @@
             </when>
         </choose>
         ,p.id,
-        p.name as projectName
+        p.name as projectName,
+        i.issue_type_id as issueTypeId
         from issue i
         inner join project p on p.id = i.project_id
         inner join issue_status iss on iss.id = i.issue_status_id
@@ -1421,7 +1427,8 @@
         p.project_key AS projectKey,
         p.name AS projectName,
         iss.name AS issueStatusName,
-        CONCAT(p.project_key, '-', i.issue_number) AS issueKey
+        CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
+        i.issue_type_id as issueTypeId
         FROM issue i
         INNER JOIN project p ON p.id = i.project_id
         INNER JOIN workspace w ON w.id = p.workspace_id
@@ -1455,7 +1462,8 @@
         p.project_key AS projectKey,
         p.name AS projectName,
         iss.name AS issueStatusName,
-        CONCAT(p.project_key, '-', i.issue_number) AS issueKey
+        CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
+        i.issue_type_id as issueTypeId
         FROM issue i
         INNER JOIN project p ON p.id = i.project_id
         INNER JOIN workspace w ON w.id = p.workspace_id
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 611a551..1859208 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -37,7 +37,7 @@
                 //  �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
                 $scope.$on("makeIssueSearch", function (event, args) {
                     //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
-                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
+                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
                 });
 
                 // �씠�뒋 �쑀�삎 蹂�寃쎌떆
@@ -118,7 +118,7 @@
                 }
 
                 //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
-                function makeIssueSearch(projectKey, issueNumber) {
+                function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
                     var combinationIssueNumber = projectKey;
                     if (issueNumber != undefined) {
                         combinationIssueNumber += "-" + issueNumber;
@@ -136,6 +136,7 @@
                         $resourceProvider.getPageContent(0, 0))).then(function (result) {
 
                         if (result.data.message.status === "success") {
+                            $scope.fn.changeIssueListMenu(issueTypeId);
                             moveMenu("issues.list");
                         } else {
                             SweetAlert.error($filter("translate")("issue.failedToSaveFieldConditions"), result.data.message.message); // "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣"

--
Gitblit v1.8.0