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 | 73 ++++++++++++++++++++++++++++++++++-- 1 files changed, 68 insertions(+), 5 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 9f3a6cc..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(); @@ -40,9 +40,16 @@ 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) { @@ -70,6 +77,11 @@ // 硫붿씪 諛쒖넚�옄 �젙蹂� if (MapUtil.getStrings(params, "sendEmails") != null) { form.setSendEmails(MapUtil.getStrings(params, "sendEmails")); + } + + // 硫붿씪 �뀥�뵆由� �젙蹂� + if (MapUtil.getString(params, "template") != null) { + form.setTemplate(MapUtil.getString(params, "template")); } // �뀓�뒪�듃 �뿉�뵒�꽣�뿉 泥⑤��맂 �뙆�씪�쓣 �씠�뒋�� �뿰寃고븯�뒗 �젙蹂� @@ -111,7 +123,28 @@ 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() { @@ -212,6 +245,12 @@ public void setDepartmentIds(List<Long> departmentIds) { this.departmentIds = departmentIds; + } + + public void addDepartmentId(Long departmentId) { + if (this.departmentIds != null) { + this.departmentIds.add(departmentId); + } } public List<Long> getRemoveFiles() { @@ -333,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