From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정

---
 src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java |   71 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 1 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 b0add88..38b42da 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 Long issueStatusId;
+    private Long workflowId;
 
     private Integer Page;
     private Integer PageSize;
 
     public static DepartmentCondition make(Map<String, Object> departmentConditions) {
-        return ConvertUtil.convertMapToClass(departmentConditions, DepartmentCondition.class);
+        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 Long getIssueStatusId() {
+        return issueStatusId;
+    }
+
+    public void setIssueStatusId(Long issueStatusId) {
+        this.issueStatusId = issueStatusId;
+    }
+
+    public Long getWorkflowId() {
+        return workflowId;
+    }
+
+    public void setWorkflowId(Long workflowId) {
+        this.workflowId = workflowId;
+    }
 }

--
Gitblit v1.8.0