From 30ddd2cf095d2857ba1134fb3deaf51392ef1030 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 21:31:45 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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..87bfed4 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,24 @@
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 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"));
+ }
+
+ return condition;
}
public Long getId() {
@@ -52,6 +67,14 @@
this.departmentCount = departmentCount;
}
+ public Long getProjectId() {
+ return projectId;
+ }
+
+ public void setProjectId(Long projectId) {
+ this.projectId = projectId;
+ }
+
public Integer getPage() {
return Page;
}
@@ -67,4 +90,28 @@
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;
+ }
}
--
Gitblit v1.8.0