From 9c237ff6f08cb7a4121cac6c642660ced1045030 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 11:16:02 +0900
Subject: [PATCH] - 트리구조 데이터 없을때 데이터 없음 표시 - 이슈 추가 시 담당부서가 워크플로우 '생성' 상태의 담당부서가 선택되는 기능
---
src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
index 0b20ebf..c81f030 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java
@@ -1,7 +1,10 @@
package kr.wisestone.owl.web.condition;
+import com.google.common.collect.Lists;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
+import java.util.List;
import java.util.Map;
/**
@@ -12,12 +15,30 @@
private String departmentName;
private String departmentDescription;
private Long departmentCount;
+ private Long projectId;
+
+ private List<Long> excludeIds = Lists.newArrayList();
+ private List<Long> departmentIds = Lists.newArrayList();
+
+ private Long issueTypeId;
+ private Integer issueStatusId;
+ private Long workflowId;
private Integer Page;
private Integer PageSize;
- public static DepartmentCondition make(Map<String, Object> departmentManageConditions) {
- return ConvertUtil.convertMapToClass(departmentManageConditions, DepartmentCondition.class);
+ public static DepartmentCondition make(Map<String, Object> departmentConditions) {
+ DepartmentCondition condition = ConvertUtil.convertMapToClass(departmentConditions, DepartmentCondition.class);
+
+ if (MapUtil.getStrings(departmentConditions, "excludeIds") != null) {
+ condition.setExcludeIds(MapUtil.getLongs(departmentConditions, "excludeIds"));
+ }
+
+ if (MapUtil.getLong(departmentConditions, "issueTypeId") != null) {
+ condition.setIssueTypeId(MapUtil.getLong(departmentConditions, "issueTypeId"));
+ }
+
+ return condition;
}
public Long getId() {
@@ -52,6 +73,14 @@
this.departmentCount = departmentCount;
}
+ public Long getProjectId() {
+ return projectId;
+ }
+
+ public void setProjectId(Long projectId) {
+ this.projectId = projectId;
+ }
+
public Integer getPage() {
return Page;
}
@@ -67,4 +96,44 @@
public void setPageSize(Integer pageSize) {
PageSize = pageSize;
}
+
+ public List<Long> getDepartmentIds() {
+ return departmentIds;
+ }
+
+ public void setDepartmentIds(List<Long> departmentIds) {
+ this.departmentIds = departmentIds;
+ }
+
+ public List<Long> getExcludeIds() {
+ return excludeIds;
+ }
+
+ public void setExcludeIds(List<Long> excludeIds) {
+ this.excludeIds = excludeIds;
+ }
+
+ public Long getIssueTypeId() {
+ return issueTypeId;
+ }
+
+ public void setIssueTypeId(Long issueTypeId) {
+ this.issueTypeId = issueTypeId;
+ }
+
+ public Integer getIssueStatusId() {
+ return issueStatusId;
+ }
+
+ public void setIssueStatusId(Integer issueStatusId) {
+ this.issueStatusId = issueStatusId;
+ }
+
+ public Long getWorkflowId() {
+ return workflowId;
+ }
+
+ public void setWorkflowId(Long workflowId) {
+ this.workflowId = workflowId;
+ }
}
--
Gitblit v1.8.0