From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
index 3028850..772eded 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
@@ -1,8 +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;
/**
@@ -18,9 +20,14 @@
private String deep; // �긽�꽭 議고쉶�뿉�꽌 媛��졇�삱 �뜲�씠�꽣�쓽 醫낅쪟瑜� 寃곗젙�븳�떎.
private boolean UseProject = false; // �봽濡쒖젥�듃�뿉�꽌 �궗�슜以묒씤 �씠�뒋���엯�쓣 媛��졇�삱�븣 �궗�슜
- private Long companyId;
- private Long ispId;
- private Long hostingId;
+ private String companyYn;
+ private String ispYn;
+ private String hostingYn;
+
+ private String startDate;
+ private String endDate;
+
+ private List<Long> projectIds = Lists.newArrayList();
public IssueTypeCondition(){}
@@ -96,27 +103,51 @@
UseProject = useProject;
}
- public Long getCompanyId() {
- return companyId;
+ public String getCompanyYn() {
+ return companyYn;
}
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
+ public void setCompanyYn(String companyYn) {
+ this.companyYn = companyYn;
}
- public Long getIspId() {
- return ispId;
+ public String getIspYn() {
+ return ispYn;
}
- public void setIspId(Long ispId) {
- this.ispId = ispId;
+ public void setIspYn(String ispYn) {
+ this.ispYn = ispYn;
}
- public Long getHostingId() {
- return hostingId;
+ public String getHostingYn() {
+ return hostingYn;
}
- public void setHostingId(Long hostingId) {
- this.hostingId = hostingId;
+ public void setHostingYn(String hostingYn) {
+ this.hostingYn = hostingYn;
+ }
+
+ public String getStartDate() {
+ return startDate;
+ }
+
+ public void setStartDate(String startDate) {
+ this.startDate = startDate;
+ }
+
+ public String getEndDate() {
+ return endDate;
+ }
+
+ public void setEndDate(String endDate) {
+ this.endDate = endDate;
+ }
+
+ public List<Long> getProjectIds() {
+ return projectIds;
+ }
+
+ public void setProjectIds(List<Long> projectIds) {
+ this.projectIds = projectIds;
}
}
--
Gitblit v1.8.0