| src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/resources/mybatis/query-template/issue-template.xml | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/scripts/app/issue/issueList.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/views/issue/issueListNormal.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 |
src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -52,6 +52,7 @@ private List<Long> statusIds = Lists.newArrayList(); private List<Long> excludeIds = Lists.newArrayList(); private List<Long> myDepartmentIds; // 내가 속해있는 부서 ID private Boolean hideIssue; public IssueCondition(){} // 대시보드 위기관리 위젯에서 사용 @@ -171,6 +172,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; @@ -483,4 +488,12 @@ public void setMyDepartmentIds(List<Long> myDepartmentIds) { this.myDepartmentIds = myDepartmentIds; } public Boolean getHideIssue() { return hideIssue; } public void setHideIssue(Boolean hideIssue) { this.hideIssue = hideIssue; } } src/main/resources/mybatis/query-template/issue-template.xml
@@ -103,6 +103,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 @@ -192,7 +196,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 @@ -301,6 +304,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 @@ -384,7 +391,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 @@ -535,7 +541,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> @@ -570,6 +575,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> @@ -661,7 +670,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> @@ -698,6 +706,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 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;
@@ -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"
