From 74dafd36a2256700e645e697194dea3dc2f2f150 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 19 11월 2021 19:29:15 +0900
Subject: [PATCH] 이슈 상세페이지
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 16 ++++++--
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 17 ++++----
src/main/resources/mybatis/query-template/issue-template.xml | 2
src/main/webapp/scripts/app/issue/issueList.controller.js | 6 ++-
src/main/webapp/views/issue/issueDetail.html | 28 +++++++-------
5 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 9f20fd4..2e09b91 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -433,13 +433,13 @@
List<Map<String, Object>> results = this.issueMapper.find(issueCondition);
// �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
- StopWatch serviceStart = new StopWatch();
- serviceStart.start();
+ /*StopWatch serviceStart = new StopWatch();
+ serviceStart.start();*/
Long totalCount = this.issueMapper.count(issueCondition);
// �뒠�떇 �쟾 - 1.1, 1.1, 1.3, 1.2
- serviceStart.stop();
- log.debug("serviceENd1 : " + serviceStart.getTime());
+ /*serviceStart.stop();
+ log.debug("serviceENd1 : " + serviceStart.getTime());*/
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �씠�뒋 �븘�씠�뵒 珥덇린�솕
@@ -858,6 +858,14 @@
this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
+ this.setParentIssue(issue,issueVo);
+ }
+
+ // �긽�쐞�씪媛� �젙蹂� 異붽�
+ private void setParentIssue(Issue issue, IssueVo issueVo) {
+ if(issue.getParentIssue() != null){
+ issueVo.setParentIssueVo(ConvertUtil.copyProperties(issue.getParentIssue(), IssueVo.class));
+ }
}
// �벑濡앹옄 �젙蹂� 異붽�
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index 61fa139..170abeb 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -51,7 +51,8 @@
private Long issueCommentCount;
private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
private WorkflowStatusVo workflowStatusVo;
- private Long parentIssueId; // �긽�쐞 �씪媛�
+ //private Long parentIssueId; // �긽�쐞 �씪媛�
+ private IssueVo parentIssueVo;
private List<IssueCompanyVo> issueCompanyVos;
private List<IssueIspVo> issueIspVos;
private List<IssueHostingVo> issueHostingVos;
@@ -410,14 +411,6 @@
this.departmentVos = departmentVos;
}
- public Long getParentIssueId() {
- return parentIssueId;
- }
-
- public void setParentIssueId(Long parentIssueId) {
- this.parentIssueId = parentIssueId;
- }
-
public List<IssueVo> getIssueDownVos() {
return issueDownVos;
}
@@ -426,5 +419,11 @@
this.issueDownVos = issueDownVos;
}
+ public IssueVo getParentIssueVo() {
+ return parentIssueVo;
+ }
+ public void setParentIssueVo(IssueVo parentIssueVo) {
+ this.parentIssueVo = parentIssueVo;
+ }
}
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index c9df236..8f0f1ec 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -10,7 +10,7 @@
issue.reverse_index as reverseIndex,
issue.title as title,
issue.description as description,
- issue.parent_issue_id AS pareniIssueId,
+ issue.parent_issue_id as parentIssueId,
issue.start_date as startDate,
issue.complete_date as completeDate,
issue.issue_number as issueNumber,
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 9b7b944..3b68c16 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -75,7 +75,8 @@
users : [], // �떞�떦�옄
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
- issueTableConfigs : [] // �씠�뒋 �뀒�씠釉� �꽕�젙
+ issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
+ parentIssueId : ""
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -102,7 +103,8 @@
search : $scope.vm.search,
projects : $scope.vm.projects,
users : $scope.vm.users,
- registers : $scope.vm.registers
+ registers : $scope.vm.registers,
+ parentIssueId : $scope.vm.parentIssueId
})
};
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index ee7485b..3fe8695 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -86,23 +86,14 @@
<!-- �긽�꽭 �솕硫� -->
<div class="support-ticket-content-w" ng-controller="issueDetailController">
<div class="support-ticket-content">
- <span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }">
- <span ng-if="vm.viewer.parentIssueId != '' || vm.viewer.parentIssueId != 'null' ">�긽�쐞 �씪媛�:{{vm.viewer.parentIssueID}}</span>
- <i class="os-icon-airplay">OWL Trial</i>
+ <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
+ <span>�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
</span>
- <label class="issue-detail-label offset-1"><span translate="issue.issueType">�씠�뒋 �쑀�삎</span> </label>
- <span class="status-pill smaller"
- ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
- <span class="offset-1"> {{vm.viewer.registerDate}}</span>
- <label class="issue-detail-label offset-1"><span translate="common.register">�벑濡앹옄</span></label>
- <span class="select3-selection__choice">
- <span class="avatar-w"><img ng-src="{{vm.viewer.registerVo.profile}}"></span>
- <span>{{vm.viewer.registerVo.byName}}</span>
- </span>
+
<div class="">
<span class="h3-div">{{vm.viewer.title}}</span>
</div>
- <div class="support-ticket-content-header issue-detail-word-break">
+ <div class="support-ticket-content-header issue-detail-word-break" style="height: 5vh">
<span class="ticket-header">
<div class="tasks-header-w">
<span class="tags">
@@ -121,7 +112,15 @@
<span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="�긽�꽭 �솕硫� �떕湲�"></i></span>
</a>
</div>
-
+ <label class="issue-detail-label"><span translate="issue.issueType">�씠�뒋 �쑀�삎</span> </label>
+ <span class="status-pill smaller"
+ ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
+ <span class="offset-1"> {{vm.viewer.registerDate}}</span>
+ <label class="issue-detail-label offset-1"><span translate="common.register">�벑濡앹옄</span></label>
+ <span class="select3-selection__choice">
+ <span class="avatar-w"><img ng-src="{{vm.viewer.registerVo.profile}}"></span>
+ <span>{{vm.viewer.registerVo.byName}}</span>
+ </span>
<div class="ticket-thread">
<div class="todo-content">
<h6 class="todo-content-subheader" translate="issue.issueInfo">�씠�뒋 �젙蹂�</h6>
@@ -185,6 +184,7 @@
</div>
</div>
</div>
+ <hr>
<div class="row">
<div class="col-md-4">
<div class="form-group">
--
Gitblit v1.8.0