From 6a5fb9dcd9fe96d62b5dbbcc2bd48db478706389 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 15:56:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 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 bbeb99a..e1b0e2b 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
@@ -1,8 +1,13 @@
package kr.wisestone.owl.web.form;
import com.google.common.collect.Lists;
+import kr.wisestone.owl.constant.UseCompany;
+import kr.wisestone.owl.domain.HostingField;
+import kr.wisestone.owl.domain.IssueType;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
+import kr.wisestone.owl.web.condition.HostingFieldCondition;
+import kr.wisestone.owl.web.controller.HostingFieldController;
import java.util.List;
import java.util.Map;
@@ -17,10 +22,8 @@
private String color;
private Long workflowId;
private Long projectId;
- private Long companyId;
- private Long ispId;
- private Long hostingId;
private List<Long> removeIds = Lists.newArrayList();
+ private Long useCompany;
public IssueTypeForm(){}
@@ -29,6 +32,20 @@
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.useCompany = 0L;
+
+ for (Long id : longs) {
+ if (id == UseCompany.USE_COMPANY_COMPANY - 1) {
+ form.useCompany += 1;
+ } else {
+ form.useCompany += id * 2;
+ }
+ }
}
return form;
@@ -94,27 +111,11 @@
this.projectId = projectId;
}
- public Long getCompanyId() {
- return companyId;
+ public Long getUseCompany() {
+ return useCompany;
}
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
- }
-
- public Long getIspId() {
- return ispId;
- }
-
- public void setIspId(Long ispId) {
- this.ispId = ispId;
- }
-
- public Long getHostingId() {
- return hostingId;
- }
-
- public void setHostingId(Long hostingId) {
- this.hostingId = hostingId;
+ public void setUseCompany(Long useCompany) {
+ this.useCompany = useCompany;
}
}
--
Gitblit v1.8.0