From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 목, 09 12월 2021 14:35:15 +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 | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 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 2399de7..c531292 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(); @@ -49,9 +52,14 @@ 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 public IssueCondition(){} + + public IssueCondition(Long issueId, Long parentIssueId){ + this.id = issueId; + this.parentIssueId = parentIssueId; + } // ���떆蹂대뱶 �쐞湲곌�由� �쐞�젽�뿉�꽌 �궗�슜 public IssueCondition(List<String> issueIds){ this.issueIds = issueIds; @@ -167,7 +175,19 @@ condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds")); } + if (MapUtil.getLong(conditions, "issueId") != null) { + condition.setId(MapUtil.getLong(conditions, "issueId")); + } + return condition; + } + + public String getKeyWord() { + return keyWord; + } + + public void setKeyWord(String keyWord) { + this.keyWord = keyWord; } public Long getId() { @@ -280,6 +300,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() { @@ -453,4 +481,20 @@ public void setParentIssueId(Long parentIssueId) { this.parentIssueId = parentIssueId; } + + public String getUseValue() { + return useValue; + } + + public void setUseValue(String useValue) { + this.useValue = useValue; + } + + public List<Long> getMyDepartmentIds() { + return myDepartmentIds; + } + + public void setMyDepartmentIds(List<Long> myDepartmentIds) { + this.myDepartmentIds = myDepartmentIds; + } } -- Gitblit v1.8.0