From 9f955be440cad5e6b868800ff0a0acd17c0a3004 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 15:30:35 +0900
Subject: [PATCH] - issue_company 테이블에 컬럼 추가 및 'tel' 컬럼 사이즈 변경 - 이슈 추가,수정 시 업체 추가된 항목들 추가 - 하위이슈 페이징 오류 수정
---
src/main/java/kr/wisestone/owl/web/form/IssueForm.java | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 369 insertions(+), 6 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..e38d3c6 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,20 @@
package kr.wisestone.owl.web.form;
import com.google.common.collect.Lists;
-import kr.wisestone.owl.domain.enumType.IssueModifyType;
+import kr.wisestone.owl.domain.Issue;
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 +30,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,11 +41,46 @@
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 String companyName;
+ private String companyManager;
+ private String companyTel;
+ private String companyUrl;
+ private String companyEmail;
+ private String companyMemo;
+ private String companyTypeName;
+ private String parentSectorName;
+ private String childSectorName;
+ private String regionName;
+ private String statusName;
+
+ private String ispName;
+ private String ispCode;
+ private String ispManager;
+ private String ispTel;
+ private String ispUrl;
+ private String ispEmail;
+ private String ispMemo;
+
+ private String hostingName;
+ private String hostingCode;
+ private String hostingManager;
+ private String hostingTel;
+ private String hostingUrl;
+ private String hostingEmail;
+ private String hostingMemo;
+
private List<Map<String, Object>> files = Lists.newArrayList(); // api�슜 泥⑤��뙆�씪
private Long parentIssueId; // �긽�쐞 �씠�뒋
- private String isApi;
+ private String isApi = Issue.IS_API_NO;
+ 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) {
@@ -72,6 +108,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"));
}
// �뀓�뒪�듃 �뿉�뵒�꽣�뿉 泥⑤��맂 �뙆�씪�쓣 �씠�뒋�� �뿰寃고븯�뒗 �젙蹂�
@@ -118,7 +159,107 @@
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"));
+ }
+
+ if (MapUtil.getString(params, "companyName") != null) {
+ form.setCompanyName(MapUtil.getString(params, "companyName"));
+ }
+ if (MapUtil.getString(params, "companyManager") != null) {
+ form.setCompanyManager(MapUtil.getString(params, "companyManager"));
+ }
+ if (MapUtil.getString(params, "companyTel") != null) {
+ form.setCompanyTel(MapUtil.getString(params, "companyTel"));
+ }
+ if (MapUtil.getString(params, "companyUrl") != null) {
+ form.setCompanyUrl(MapUtil.getString(params, "companyUrl"));
+ }
+ if (MapUtil.getString(params, "companyEmail") != null) {
+ form.setCompanyEmail(MapUtil.getString(params, "companyEmail"));
+ }
+ if (MapUtil.getString(params, "companyMemo") != null) {
+ form.setCompanyMemo(MapUtil.getString(params, "companyMemo"));
+ }
+ if (MapUtil.getString(params, "companyTypeName") != null) {
+ form.setCompanyTypeName(MapUtil.getString(params, "companyTypeName"));
+ }
+ if (MapUtil.getString(params, "parentSectorName") != null) {
+ form.setParentSectorName(MapUtil.getString(params, "parentSectorName"));
+ }
+ if (MapUtil.getString(params, "childSectorName") != null) {
+ form.setChildSectorName(MapUtil.getString(params, "childSectorName"));
+ }
+ if (MapUtil.getString(params, "regionName") != null) {
+ form.setRegionName(MapUtil.getString(params, "regionName"));
+ }
+ if (MapUtil.getString(params, "statusName") != null) {
+ form.setStatusName(MapUtil.getString(params, "statusName"));
+ }
+
+ if (MapUtil.getString(params, "ispName") != null) {
+ form.setIspName(MapUtil.getString(params, "ispName"));
+ }
+ if (MapUtil.getString(params, "ispCode") != null) {
+ form.setIspCode(MapUtil.getString(params, "ispCode"));
+ }
+ if (MapUtil.getString(params, "ispManager") != null) {
+ form.setIspManager(MapUtil.getString(params, "ispManager"));
+ }
+ if (MapUtil.getString(params, "ispTel") != null) {
+ form.setIspTel(MapUtil.getString(params, "ispTel"));
+ }
+ if (MapUtil.getString(params, "ispUrl") != null) {
+ form.setIspUrl(MapUtil.getString(params, "ispUrl"));
+ }
+ if (MapUtil.getString(params, "ispEmail") != null) {
+ form.setIspEmail(MapUtil.getString(params, "ispEmail"));
+ }
+ if (MapUtil.getString(params, "ispMemo") != null) {
+ form.setIspMemo(MapUtil.getString(params, "ispMemo"));
+ }
+
+ if (MapUtil.getString(params, "hostingName") != null) {
+ form.setHostingName(MapUtil.getString(params, "hostingName"));
+ }
+ if (MapUtil.getString(params, "hostingCode") != null) {
+ form.setHostingCode(MapUtil.getString(params, "hostingCode"));
+ }
+ if (MapUtil.getString(params, "hostingManager") != null) {
+ form.setHostingManager(MapUtil.getString(params, "hostingManager"));
+ }
+ if (MapUtil.getString(params, "hostingTel") != null) {
+ form.setHostingTel(MapUtil.getString(params, "hostingTel"));
+ }
+ if (MapUtil.getString(params, "hostingUrl") != null) {
+ form.setHostingUrl(MapUtil.getString(params, "hostingUrl"));
+ }
+ if (MapUtil.getString(params, "hostingEmail") != null) {
+ form.setHostingEmail(MapUtil.getString(params, "hostingEmail"));
+ }
+ if (MapUtil.getString(params, "hostingMemo") != null) {
+ form.setHostingMemo(MapUtil.getString(params, "hostingMemo"));
+ }
+
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 +360,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 +503,220 @@
public void setFiles(List<Map<String, Object>> files) {
this.files = files;
}
+
+ public String getTemplate() {
+ return template;
+ }
+
+ public void setTemplate(String template) {
+ this.template = template;
+ }
+
+ public List<String> getDownIssuesStatus() {
+ return downIssuesStatus;
+ }
+
+ public void setDownIssuesStatus(List<String> downIssuesStatus) {
+ this.downIssuesStatus = downIssuesStatus;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getCompanyManager() {
+ return companyManager;
+ }
+
+ public void setCompanyManager(String companyManager) {
+ this.companyManager = companyManager;
+ }
+
+ public String getCompanyTel() {
+ return companyTel;
+ }
+
+ public void setCompanyTel(String companyTel) {
+ this.companyTel = companyTel;
+ }
+
+ public String getCompanyUrl() {
+ return companyUrl;
+ }
+
+ public void setCompanyUrl(String companyUrl) {
+ this.companyUrl = companyUrl;
+ }
+
+ public String getCompanyEmail() {
+ return companyEmail;
+ }
+
+ public void setCompanyEmail(String companyEmail) {
+ this.companyEmail = companyEmail;
+ }
+
+ public String getCompanyMemo() {
+ return companyMemo;
+ }
+
+ public void setCompanyMemo(String companyMemo) {
+ this.companyMemo = companyMemo;
+ }
+
+ public String getIspName() {
+ return ispName;
+ }
+
+ public void setIspName(String ispName) {
+ this.ispName = ispName;
+ }
+
+ public String getIspCode() {
+ return ispCode;
+ }
+
+ public void setIspCode(String ispCode) {
+ this.ispCode = ispCode;
+ }
+
+ public String getIspManager() {
+ return ispManager;
+ }
+
+ public void setIspManager(String ispManager) {
+ this.ispManager = ispManager;
+ }
+
+ public String getIspTel() {
+ return ispTel;
+ }
+
+ public void setIspTel(String ispTel) {
+ this.ispTel = ispTel;
+ }
+
+ public String getIspUrl() {
+ return ispUrl;
+ }
+
+ public void setIspUrl(String ispUrl) {
+ this.ispUrl = ispUrl;
+ }
+
+ public String getIspEmail() {
+ return ispEmail;
+ }
+
+ public void setIspEmail(String ispEmail) {
+ this.ispEmail = ispEmail;
+ }
+
+ public String getIspMemo() {
+ return ispMemo;
+ }
+
+ public void setIspMemo(String ispMemo) {
+ this.ispMemo = ispMemo;
+ }
+
+ public String getHostingName() {
+ return hostingName;
+ }
+
+ public void setHostingName(String hostingName) {
+ this.hostingName = hostingName;
+ }
+
+ public String getHostingCode() {
+ return hostingCode;
+ }
+
+ public void setHostingCode(String hostingCode) {
+ this.hostingCode = hostingCode;
+ }
+
+ public String getHostingManager() {
+ return hostingManager;
+ }
+
+ public void setHostingManager(String hostingManager) {
+ this.hostingManager = hostingManager;
+ }
+
+ public String getHostingTel() {
+ return hostingTel;
+ }
+
+ public void setHostingTel(String hostingTel) {
+ this.hostingTel = hostingTel;
+ }
+
+ public String getHostingUrl() {
+ return hostingUrl;
+ }
+
+ public void setHostingUrl(String hostingUrl) {
+ this.hostingUrl = hostingUrl;
+ }
+
+ public String getHostingEmail() {
+ return hostingEmail;
+ }
+
+ public void setHostingEmail(String hostingEmail) {
+ this.hostingEmail = hostingEmail;
+ }
+
+ public String getHostingMemo() {
+ return hostingMemo;
+ }
+
+ public void setHostingMemo(String hostingMemo) {
+ this.hostingMemo = hostingMemo;
+ }
+
+ public String getCompanyTypeName() {
+ return companyTypeName;
+ }
+
+ public void setCompanyTypeName(String companyTypeName) {
+ this.companyTypeName = companyTypeName;
+ }
+
+ public String getParentSectorName() {
+ return parentSectorName;
+ }
+
+ public void setParentSectorName(String parentSectorName) {
+ this.parentSectorName = parentSectorName;
+ }
+
+ public String getChildSectorName() {
+ return childSectorName;
+ }
+
+ public void setChildSectorName(String childSectorName) {
+ this.childSectorName = childSectorName;
+ }
+
+ public String getRegionName() {
+ return regionName;
+ }
+
+ public void setRegionName(String regionName) {
+ this.regionName = regionName;
+ }
+
+ public String getStatusName() {
+ return statusName;
+ }
+
+ public void setStatusName(String statusName) {
+ this.statusName = statusName;
+ }
}
--
Gitblit v1.8.0