From 6ae9f3ab6d498f7a4d72c3fbbe8b90e6358f389b Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 화, 21 12월 2021 13:31:54 +0900 Subject: [PATCH] 사용자 정의필드 시간형태 등호 변경 --- 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 9ff571f..30b89de 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; @@ -41,9 +40,17 @@ 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; + private List<String> downIssuesStatus = Lists.newArrayList(); //�븯�쐞�씠�뒋 �긽�깭 public IssueForm() { + } + + @Override + public IssueForm clone() throws CloneNotSupportedException { + return (IssueForm) super.clone(); } public static IssueForm make(Map<String, Object> params) { @@ -117,7 +124,33 @@ 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")); + } + + // �븯�쐞�씠�뒋 �긽�깭 + if (MapUtil.getObject(params, "downIssuesStatus") != null){ + form.setDownIssuesStatus((List)MapUtil.getObject(params, "downIssuesStatus")); + } 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() { @@ -218,6 +251,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() { @@ -340,6 +379,22 @@ 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; } @@ -347,4 +402,12 @@ public void setTemplate(String template) { this.template = template; } + + public List<String> getDownIssuesStatus() { + return downIssuesStatus; + } + + public void setDownIssuesStatus(List<String> downIssuesStatus) { + this.downIssuesStatus = downIssuesStatus; + } } -- Gitblit v1.8.0