From 6e9f504acc73687b623a1f7598eb3833cbc088aa Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 08 12월 2021 18:04:50 +0900 Subject: [PATCH] ** DB 초기화 필요 업체 - url 인덱스 추가 및 url 중복으로 추가 못하도록 수정 --- src/main/java/kr/wisestone/owl/web/form/IssueForm.java | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 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 bf58d29..f5f185d 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,18 @@ 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 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 +28,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(); @@ -45,6 +44,11 @@ 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 +76,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")); } // �뀓�뒪�듃 �뿉�뵒�꽣�뿉 泥⑤��맂 �뙆�씪�쓣 �씠�뒋�� �뿰寃고븯�뒗 �젙蹂� @@ -119,6 +128,22 @@ 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() { @@ -219,6 +244,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() { @@ -356,4 +387,12 @@ 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