From 1fac1465cdef9f3b4573edf1869af120c5cbee79 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 15:27:07 +0900
Subject: [PATCH] api 이슈 추가시 업체/isp/호스팅에 해당 도메인이 포함되면 해당 업체 자동 입력
---
src/main/java/kr/wisestone/owl/web/form/IssueForm.java | 127 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 26 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueForm.java
index 1350967..0d795cd 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueForm.java
@@ -1,20 +1,19 @@
package kr.wisestone.owl.web.form;
import com.google.common.collect.Lists;
-import kr.wisestone.owl.domain.enumType.IssueModifyType;
import kr.wisestone.owl.util.ConvertUtil;
-import kr.wisestone.owl.util.DateUtil;
import kr.wisestone.owl.util.MapUtil;
-import org.springframework.util.StringUtils;
+import kr.wisestone.owl.vo.CompanyFieldVo;
-import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* Created by wisestone on 2018-01-03.
*/
-public class IssueForm {
+public class IssueForm implements Cloneable {
+
+
private Long id;
private Long projectId;
private Long issueStatusId;
@@ -30,6 +29,7 @@
private List<Long> userIds = Lists.newArrayList();
private List<Long> departmentIds = Lists.newArrayList(); // �떞�떦 遺��꽌
private List<String> sendEmails = Lists.newArrayList(); // �씠硫붿씪 諛쒖넚 ���긽�옄
+ private String template;
private List<Long> attachedFileIds = Lists.newArrayList();
private Long relationIssue; // �뿰愿� �씪媛�
private List<Map<String, Object>> issueCustomFields = Lists.newArrayList();
@@ -37,12 +37,19 @@
private List<Long> removeIds = Lists.newArrayList();
private List<Long> ids = Lists.newArrayList(); // �씠�뒋 �떎以� �긽�깭 蹂�寃쎌뿉�꽌 �궗�슜
private String comment; // �씠�뒋 �긽�깭 蹂�寃쎌뿉�꽌 蹂�寃� �궗�쑀瑜� �엯�젰�븷 �븣 �궗�슜
- private Long companyId; //�뾽泥댄븘�뱶
- private Long ispId; //ISP�븘�뱶
- private Long hostingId; //�샇�뒪�똿�븘�뱶
+ private List<Map<String, Object>> issueCompanyFields = Lists.newArrayList();
+ private List<Map<String, Object>> issueIspFields = Lists.newArrayList();
+ private List<Map<String, Object>> issueHostingFields = Lists.newArrayList();
+ private List<Map<String, Object>> files = Lists.newArrayList(); // api�슜 泥⑤��뙆�씪
private Long parentIssueId; // �긽�쐞 �씠�뒋
+ private String isApi;
public IssueForm() {
+ }
+
+ @Override
+ public IssueForm clone() throws CloneNotSupportedException {
+ return (IssueForm) super.clone();
}
public static IssueForm make(Map<String, Object> params) {
@@ -72,6 +79,11 @@
form.setSendEmails(MapUtil.getStrings(params, "sendEmails"));
}
+ // 硫붿씪 �뀥�뵆由� �젙蹂�
+ if (MapUtil.getString(params, "template") != null) {
+ form.setTemplate(MapUtil.getString(params, "template"));
+ }
+
// �뀓�뒪�듃 �뿉�뵒�꽣�뿉 泥⑤��맂 �뙆�씪�쓣 �씠�뒋�� �뿰寃고븯�뒗 �젙蹂�
if (MapUtil.getLongs(params, "attachedFileIds") != null) {
form.setAttachedFileIds(MapUtil.getLongs(params, "attachedFileIds"));
@@ -98,20 +110,41 @@
}
// �뾽泥� �븘�뱶 �젙蹂�
- if (MapUtil.getLongs(params, "companyFieldId") != null){
- form.setCompanyId(MapUtil.getLong(params, "companyFieldId"));
+ if (MapUtil.getObject(params, "issueCompanyFields") != null){
+ form.setIssueCompanyFields((List)MapUtil.getObject(params, "issueCompanyFields"));
}
// ISP �븘�뱶 �젙蹂�
- if (MapUtil.getLongs(params, "ispFieldId") != null){
- form.setIspId(MapUtil.getLong(params, "ispFieldId"));
+ if (MapUtil.getObject(params, "issueIspFields") != null){
+ form.setIssueIspFields((List)MapUtil.getObject(params, "issueIspFields"));
}
// HOSTING �븘�뱶 �젙蹂�
- if (MapUtil.getLongs(params, "hostingFieldId") != null){
- form.setHostingId(MapUtil.getLong(params, "hostingFieldId"));
+ if (MapUtil.getObject(params, "issueHostingFields") != null){
+ form.setIssueHostingFields((List)MapUtil.getObject(params, "issueHostingFields"));
+ }
+
+ // api 泥⑤��뙆�씪
+ if (MapUtil.getObject(params, "files") != null){
+ form.setFiles((List)MapUtil.getObject(params, "files"));
}
return form;
+ }
+
+ // 以묐났媛믪쑝濡� �궗�슜�븯�뒗 �궗�슜�옄�젙�쓽�븘�뱶留� �떎�떆 �꽕�젙
+ public void setUseIssueCustomFields(List<Long> useIssueCustomFields) {
+ List<Map<String, Object>> results = Lists.newArrayList();
+
+ for (Map<String, Object> customValue : this.getIssueCustomFields()) {
+ for (Long customFieldId : useIssueCustomFields) {
+// Map<String, Object> customFieldVo = (Map<String, Object>)MapUtil.getObject(customValue, "customFieldVo");
+ if (customFieldId.equals(MapUtil.getLong(customValue, "customFieldId"))) {
+ results.add(customValue);
+ }
+ }
+ }
+
+ this.setIssueCustomFields(results);
}
public Long getId() {
@@ -214,6 +247,12 @@
this.departmentIds = departmentIds;
}
+ public void addDepartmentId(Long departmentId) {
+ if (this.departmentIds != null) {
+ this.departmentIds.add(departmentId);
+ }
+ }
+
public List<Long> getRemoveFiles() {
return removeFiles;
}
@@ -290,28 +329,40 @@
this.comment = comment;
}
- public Long getCompanyId() {
- return companyId;
+ public List<Map<String, Object>> getIssueCompanyFields() {
+ return issueCompanyFields;
}
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
+ public void setIssueCompanyFields(List<Map<String, Object>> issueCompanyFields) {
+ this.issueCompanyFields = issueCompanyFields;
}
- public Long getIspId() {
- return ispId;
+ public void addissueCompanyField(Map<String, Object> issueCompanyFields) {
+ this.issueCompanyFields.add(issueCompanyFields);
}
- public void setIspId(Long ispId) {
- this.ispId = ispId;
+ public List<Map<String, Object>> getIssueIspFields() {
+ return issueIspFields;
}
- public Long getHostingId() {
- return hostingId;
+ public void setIssueIspFields(List<Map<String, Object>> issueIspFields) {
+ this.issueIspFields = issueIspFields;
}
- public void setHostingId(Long hostingId) {
- this.hostingId = hostingId;
+ public void addIssueIspField(Map<String, Object> issueIspFields) {
+ this.issueIspFields.add(issueIspFields);
+ }
+
+ public List<Map<String, Object>> getIssueHostingFields() {
+ return issueHostingFields;
+ }
+
+ public void setIssueHostingFields(List<Map<String, Object>> issueHostingFields) {
+ this.issueHostingFields = issueHostingFields;
+ }
+
+ public void addIssueHostingField(Map<String, Object> issueHostingFields) {
+ this.issueHostingFields.add(issueHostingFields);
}
public Long getParentIssueId() {
@@ -321,4 +372,28 @@
public void setParentIssueId(Long parentIssueId) {
this.parentIssueId = parentIssueId;
}
+
+ public String getIsApi() {
+ return isApi;
+ }
+
+ public void setIsApi(String isApi) {
+ this.isApi = isApi;
+ }
+
+ public List<Map<String, Object>> getFiles() {
+ return files;
+ }
+
+ public void setFiles(List<Map<String, Object>> files) {
+ this.files = files;
+ }
+
+ public String getTemplate() {
+ return template;
+ }
+
+ public void setTemplate(String template) {
+ this.template = template;
+ }
}
--
Gitblit v1.8.0