From 84410b2106452f639c1f6f7b21b5f7ba9a073ca9 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 09 12월 2021 15:35:43 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 13 +++++++++++++
src/main/webapp/views/issue/issueListNormal.html | 4 ++++
src/main/resources/mybatis/query-template/issue-template.xml | 20 ++++++++++++++++----
src/main/webapp/scripts/app/issue/issueList.controller.js | 8 +++++++-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 2 ++
5 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
index c531292..1a29c61 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -53,6 +53,7 @@
private List<Long> statusIds = Lists.newArrayList();
private List<Long> excludeIds = Lists.newArrayList();
private List<Long> myDepartmentIds; // �궡媛� �냽�빐�엳�뒗 遺��꽌 ID
+ private Boolean hideIssue;
public IssueCondition(){}
@@ -177,6 +178,10 @@
if (MapUtil.getLong(conditions, "issueId") != null) {
condition.setId(MapUtil.getLong(conditions, "issueId"));
+ }
+
+ if (MapUtil.getBoolean(conditions, "hideIssue")) {
+ condition.setHideIssue(MapUtil.getBoolean(conditions, "hideIssue"));
}
return condition;
@@ -497,4 +502,12 @@
public void setMyDepartmentIds(List<Long> myDepartmentIds) {
this.myDepartmentIds = myDepartmentIds;
}
+
+ public Boolean getHideIssue() {
+ return hideIssue;
+ }
+
+ public void setHideIssue(Boolean hideIssue) {
+ this.hideIssue = hideIssue;
+ }
}
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 599bf68..6df1c93 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -104,6 +104,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="hideIssue != null and hideIssue == true">
+ AND issue_status.issue_status_type != 'CLOSE'
+ </if>
+
<choose>
<when test="projectIds.size != 0">
AND project.id IN
@@ -193,7 +197,6 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
- AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -302,6 +305,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="hideIssue != null and hideIssue == true">
+ AND issue_status.issue_status_type != 'CLOSE'
+ </if>
+
<choose>
<when test="myDepartmentIds.size != 0">
AND isd.department_id IN
@@ -385,7 +392,6 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
- AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -536,7 +542,6 @@
LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
- AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -571,6 +576,10 @@
<if test="endCompleteDate != null and !endCompleteDate.equals('')">
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
+ </if>
+
+ <if test="hideIssue != null and hideIssue == true">
+ AND iss.issue_status_type != 'CLOSE'
</if>
<choose>
@@ -662,7 +671,6 @@
LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
- AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -699,6 +707,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="hideIssue != null and hideIssue == true">
+ AND iss.issue_status_type != 'CLOSE'
+ </if>
+
<choose>
<when test="myDepartmentIds.size != 0">
AND isd.department_id IN
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 0d1140c..b7e8b5c 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -497,6 +497,7 @@
// �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙
function setRelTableConfigs(issueTableConfigVo) {
+ if (issueTableConfigVo == null) return;
var issueTableConfigs = issueTableConfigVo.issueTableConfigs;
// �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
@@ -548,6 +549,7 @@
// �븯�쐞 �씠�뒋 �긽�꽭 議고쉶 寃곌낵 �꽕�젙
function setDownTableConfigs(issueTableConfigVo) {
+ if (issueTableConfigVo == null) return;
var issueTableConfigs = issueTableConfigVo.issueTableConfigs;
// �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index c596f5d..7cbdfe6 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -84,7 +84,8 @@
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
- parentIssueId : ""
+ parentIssueId : "",
+ hideIssue : false
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -365,6 +366,7 @@
endStartDate : "",
beginCompleteDate : "",
endCompleteDate : "",
+ hideIssue : $scope.vm.hideIssue,
projectIds : (function () {
var projectIds = [];
@@ -490,6 +492,10 @@
if (selectedPage < 0) {
selectedPage = 0;
}
+
+ if ($scope.vm.hideIssue) {
+ $scope.vm.hideIssue = true;
+ }
// �쁽�옱 �럹�씠吏� �젙蹂�
var currentPage = 0;
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 7575114..8bf619b 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -334,6 +334,10 @@
<!--span class="badge-tip" function-tool-tip data-placement="top" data-toggle="tooltip" data-original-title="�뿊�� �떎�슫濡쒕뱶, �씪愿� 蹂�寃� �벑 �떎�뼇�븳 湲곕뒫�쓣 �젣怨듯빀�땲�떎.">?</span-->
<input type="hidden" name="conditions">
<div class="btn-group">
+ <input type="checkbox" ng-model="vm.hideIssue"> �셿猷� �씠�뒋 �닲湲곌린
+ <button type="button" ng-click="fn.getPageList(0)">�깉濡쒓퀬移�</button>
+ </div>
+ <div class="btn-group">
<button aria-expanded="false" aria-haspopup="true"
tabindex="-1"
class="btn btn-secondary dropdown-toggle"
--
Gitblit v1.8.0