From de2abff4377c9ee83161c954a51de4c9390fff76 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 15 12월 2021 18:34:21 +0900 Subject: [PATCH] 프로필에 내 사용자 등급/부서 표시 --- src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 88 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 82 insertions(+), 6 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 0ecc5fb..0113fcd 100644 --- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java +++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java @@ -16,6 +16,7 @@ */ public class IssueCondition { private Long id; + private String keyWord; private String title; private String description; private String combinationIssueNumber; @@ -33,7 +34,9 @@ private Long workspaceId; private String projectType; private String deep; + private String isApi; private Long parentIssueId; // �긽�쐞 �씪媛� + private String useValue; private List<Long> projectIds = Lists.newArrayList(); private List<Long> issueStatusIds = Lists.newArrayList(); private List<Long> issueTypeIds = Lists.newArrayList(); @@ -43,16 +46,23 @@ private List<Long> departmentIds = Lists.newArrayList(); private List<Long> registerIds = Lists.newArrayList(); private List<String> issueIds = Lists.newArrayList(); // �씠�뒋 紐⑸줉 寃��깋�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶濡� 1李� 寃��깋�븳 寃곌낵瑜� �떞�쓣�븣 �궗�슜 - private List<String> userCustomFields = Lists.newArrayList(); private List<Map<String, Object>> issueCustomFields = Lists.newArrayList(); private List<Map<String, Object>> issueCompanyField = Lists.newArrayList(); private List<Map<String, Object>> issueIspField = Lists.newArrayList(); private List<Map<String, Object>> issueHostingField = Lists.newArrayList(); private List<Long> statusIds = Lists.newArrayList(); private List<Long> excludeIds = Lists.newArrayList(); - + private List<Long> myDepartmentIds; // �궡媛� �냽�빐�엳�뒗 遺��꽌 ID + private Boolean hideDownIssue; + private Boolean hideCompleteIssue; + private Boolean isTree; // �듃由ш뎄議� 紐⑤뱶 �씪�븣 public IssueCondition(){} + + public IssueCondition(Long issueId, Long parentIssueId){ + this.id = issueId; + this.parentIssueId = parentIssueId; + } // ���떆蹂대뱶 �쐞湲곌�由� �쐞�젽�뿉�꽌 �궗�슜 public IssueCondition(List<String> issueIds){ this.issueIds = issueIds; @@ -168,7 +178,33 @@ condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds")); } + if (MapUtil.getLong(conditions, "issueId") != null) { + condition.setId(MapUtil.getLong(conditions, "issueId")); + } + + if (MapUtil.getBoolean(conditions, "hideDownIssue") != null) { + condition.setHideDownIssue(MapUtil.getBoolean(conditions, "hideDownIssue")); + } + + if (MapUtil.getBoolean(conditions, "hideCompleteIssue") != null) { + condition.setHideCompleteIssue(MapUtil.getBoolean(conditions, "hideCompleteIssue")); + } + + if (MapUtil.getBoolean(conditions, "isTree") != null) { + condition.setTree(MapUtil.getBoolean(conditions, "isTree")); + } else { + condition.setTree(false); + } + return condition; + } + + public String getKeyWord() { + return keyWord; + } + + public void setKeyWord(String keyWord) { + this.keyWord = keyWord; } public Long getId() { @@ -281,6 +317,14 @@ public void setDeep(String deep) { this.deep = deep; + } + + public String getIsApi() { + return isApi; + } + + public void setIsApi(String isApi) { + this.isApi = isApi; } public List<Long> getProjectIds() { @@ -455,11 +499,43 @@ this.parentIssueId = parentIssueId; } - public List<String> getUserCustomFields() { - return userCustomFields; + public String getUseValue() { + return useValue; } - public void setUserCustomFields(List<String> userCustomFields) { - this.userCustomFields = userCustomFields; + public void setUseValue(String useValue) { + this.useValue = useValue; + } + + public List<Long> getMyDepartmentIds() { + return myDepartmentIds; + } + + public void setMyDepartmentIds(List<Long> myDepartmentIds) { + this.myDepartmentIds = myDepartmentIds; + } + + public Boolean getHideDownIssue() { + return hideDownIssue; + } + + public void setHideDownIssue(Boolean hideDownIssue) { + this.hideDownIssue = hideDownIssue; + } + + public Boolean getHideCompleteIssue() { + return hideCompleteIssue; + } + + public void setHideCompleteIssue(Boolean hideCompleteIssue) { + this.hideCompleteIssue = hideCompleteIssue; + } + + public Boolean getTree() { + return isTree; + } + + public void setTree(Boolean tree) { + isTree = tree; } } -- Gitblit v1.8.0