From 729564acfd97630060acdd77694da87cc1c67979 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 18 11월 2021 09:41:41 +0900 Subject: [PATCH] 이슈관리 추가 완료 *DB날리고 실행 --- src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 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 c462a95..2399de7 100644 --- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java +++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java @@ -33,15 +33,20 @@ private Long workspaceId; private String projectType; private String deep; + private Long parentIssueId; // �긽�쐞 �씪媛� private List<Long> projectIds = Lists.newArrayList(); private List<Long> issueStatusIds = Lists.newArrayList(); private List<Long> issueTypeIds = Lists.newArrayList(); private List<Long> priorityIds = Lists.newArrayList(); private List<Long> severityIds = Lists.newArrayList(); private List<Long> userIds = Lists.newArrayList(); + private List<Long> departmentIds = Lists.newArrayList(); private List<Long> registerIds = Lists.newArrayList(); private List<String> issueIds = Lists.newArrayList(); // �씠�뒋 紐⑸줉 寃��깋�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶濡� 1李� 寃��깋�븳 寃곌낵瑜� �떞�쓣�븣 �궗�슜 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(); @@ -82,6 +87,18 @@ if (MapUtil.getObject(conditions, "issueCustomFields") != null) { condition.setIssueCustomFields((List)MapUtil.getObject(conditions, "issueCustomFields")); + } + + if (MapUtil.getObject(conditions, "issueCompanyField") != null) { + condition.setIssueCompanyField((List)MapUtil.getObject(conditions, "issueCompanyField")); + } + + if (MapUtil.getObject(conditions, "issueIspField") != null) { + condition.setIssueIspField((List)MapUtil.getObject(conditions, "issueIspField")); + } + + if (MapUtil.getObject(conditions, "issueHostingField") != null) { + condition.setIssueHostingField((List)MapUtil.getObject(conditions, "issueHostingField")); } if (StringUtils.hasText(MapUtil.getString(conditions, "beginRegisterDate"))) { @@ -136,6 +153,10 @@ if (MapUtil.getLongs(conditions, "userIds") != null) { condition.setUserIds(MapUtil.getLongs(conditions, "userIds")); + } + + if (MapUtil.getLongs(conditions, "departmentIds") != null) { + condition.setDepartmentIds(MapUtil.getLongs(conditions, "departmentIds")); } if (MapUtil.getLongs(conditions, "registerIds") != null) { @@ -317,6 +338,14 @@ this.userIds = userIds; } + public List<Long> getDepartmentIds() { + return departmentIds; + } + + public void setDepartmentIds(List<Long> departmentIds) { + this.departmentIds = departmentIds; + } + public List<Long> getRegisterIds() { return registerIds; } @@ -339,6 +368,30 @@ public void setIssueCustomFields(List<Map<String, Object>> issueCustomFields) { this.issueCustomFields = issueCustomFields; + } + + public List<Map<String, Object>> getIssueCompanyField() { + return issueCompanyField; + } + + public void setIssueCompanyField(List<Map<String, Object>> issueCompanyField) { + this.issueCompanyField = issueCompanyField; + } + + public List<Map<String, Object>> getIssueIspField() { + return issueIspField; + } + + public void setIssueIspField(List<Map<String, Object>> issueIspField) { + this.issueIspField = issueIspField; + } + + public List<Map<String, Object>> getIssueHostingField() { + return issueHostingField; + } + + public void setIssueHostingField(List<Map<String, Object>> issueHostingField) { + this.issueHostingField = issueHostingField; } public List<String> getIssueIds() { @@ -393,4 +446,11 @@ this.excludeIds = excludeIds; } + public Long getParentIssueId() { + return parentIssueId; + } + + public void setParentIssueId(Long parentIssueId) { + this.parentIssueId = parentIssueId; + } } -- Gitblit v1.8.0