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/form/IssueTypeForm.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
index d903b49..65ffab4 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.web.form;
import com.google.common.collect.Lists;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
@@ -17,10 +18,9 @@
private String color;
private Long workflowId;
private Long projectId;
- private String companyYn;
- private String ispYn;
- private String hostingYn;
private List<Long> removeIds = Lists.newArrayList();
+ private Long usePartner;
+ private Boolean inheritPartners;
public IssueTypeForm(){}
@@ -29,6 +29,28 @@
if (MapUtil.getLongs(params, "removeIds") != null) {
form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
+ }
+
+ if (MapUtil.getLongs(params, "companyIds") != null) {
+// form.setRemoveIds(MapUtil.getLongs(params, "companyIds"));
+ List<Long> longs = MapUtil.getLongs(params, "companyIds");
+ form.usePartner = 0L;
+
+ for (Long id : longs) {
+ if (id == UsePartner.USE_PARTNER_COMPANY - 1) {
+ form.usePartner += 1;
+ } else {
+ form.usePartner += id * 2;
+ }
+ }
+ }
+
+ if (MapUtil.getString(params, "inheritPartners") != null) {
+ if (MapUtil.getString(params, "inheritPartners").equals("true")) {
+ form.setInheritPartners(true);
+ } else {
+ form.setInheritPartners(false);
+ }
}
return form;
@@ -94,27 +116,19 @@
this.projectId = projectId;
}
- public String getCompanyYn() {
- return companyYn;
+ public Long getUsePartner() {
+ return usePartner;
}
- public void setCompanyYn(String companyYn) {
- this.companyYn = companyYn;
+ public void setUsePartner(Long usePartner) {
+ this.usePartner = usePartner;
}
- public String getIspYn() {
- return ispYn;
+ public Boolean getInheritPartners() {
+ return inheritPartners;
}
- public void setIspYn(String ispYn) {
- this.ispYn = ispYn;
- }
-
- public String getHostingYn() {
- return hostingYn;
- }
-
- public void setHostingYn(String hostingYn) {
- this.hostingYn = hostingYn;
+ public void setInheritPartners(Boolean inheritPartners) {
+ this.inheritPartners = inheritPartners;
}
}
--
Gitblit v1.8.0