From be5e72136e63e4d3513c4c66979fad8e0109c42d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 15:53:10 +0900
Subject: [PATCH] 이슈유형 - 업체,isp,호스팅 정보 Y/N 으로 변경
---
src/main/java/kr/wisestone/owl/domain/IssueType.java | 35 ++++++++++-
src/main/resources/migration/V1_11__Alter_Table.sql | 8 +-
src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java | 30 +++++-----
src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java | 30 +++++-----
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 42 +++++++------
5 files changed, 87 insertions(+), 58 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java
index c100ca0..0acdbd2 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueType.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueType.java
@@ -18,6 +18,9 @@
private String name;
private String description;
private String color;
+ private String companyYn;
+ private String ispYn;
+ private String hostingYn;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "workspace_id")
@@ -31,7 +34,7 @@
@JoinColumn(name = "project_id")
private Project project;
- @ManyToOne(fetch = FetchType.LAZY)
+ /*@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "company_id")
private CompanyField companyField;
@@ -41,7 +44,7 @@
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "hosting_id")
- private HostingField hostingField;
+ private HostingField hostingField;*/
@OneToMany(mappedBy = "issueType", cascade = { CascadeType.ALL }, orphanRemoval = true)
private Set<IssueTypeCustomField> issueTypeCustomFields = new HashSet<>();
@@ -121,7 +124,31 @@
this.project = project;
}
- public CompanyField getCompanyField() {
+ public String getCompanyYn() {
+ return companyYn;
+ }
+
+ public void setCompanyYn(String companyYn) {
+ this.companyYn = companyYn;
+ }
+
+ public String getIspYn() {
+ return ispYn;
+ }
+
+ public void setIspYn(String ispYn) {
+ this.ispYn = ispYn;
+ }
+
+ public String getHostingYn() {
+ return hostingYn;
+ }
+
+ public void setHostingYn(String hostingYn) {
+ this.hostingYn = hostingYn;
+ }
+
+ /* public CompanyField getCompanyField() {
return companyField;
}
@@ -143,5 +170,5 @@
public void setHostingField(HostingField hostingField) {
this.hostingField = hostingField;
- }
+ }*/
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index ae2e65f..5e457e9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -123,19 +123,18 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- if(issueTypeForm.getCompanyId() != null){
- CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
- issueType.setCompanyField(companyField);
- }
- if(issueTypeForm.getIspId() != null){
- IspField ispField = this.ispFieldService.getIsp(issueTypeForm.getIspId());
- issueType.setIspField(ispField);
- }
- if(issueTypeForm.getHostingId() != null){
- HostingField hostingField = this.hostingFieldService.getHosting(issueTypeForm.getHostingId());
- issueType.setHostingField(hostingField);
- }
+ String Yes = "Y";
+ String No = "N";
+ if(!issueTypeForm.getCompanyYn().equals(No)){
+ issueType.setCompanyYn(Yes);
+ }
+ if(!issueTypeForm.getHostingYn().equals(No)){
+ issueType.setHostingYn(Yes);
+ }
+ if(!issueTypeForm.getIspYn().equals(No)){
+ issueType.setIspYn(Yes);
+ }
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -194,9 +193,9 @@
}
this.setUseIssueTypeByProject(issueTypeVos);
- this.setUseIssueTypeByCompanyField(issueTypeVos);
+ /*this.setUseIssueTypeByCompanyField(issueTypeVos);
this.setUseIssueTypeByIspField(issueTypeVos);
- this.setUseIssueTypeByHostingField(issueTypeVos);
+ this.setUseIssueTypeByHostingField(issueTypeVos);*/
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -226,7 +225,7 @@
}
}
- // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뾽泥� �젙蹂대�� �뀑�똿�븳�떎.
+ /*// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뾽泥� �젙蹂대�� �뀑�똿�븳�떎.
private void setUseIssueTypeByCompanyField(List<IssueTypeVo> issueTypeVos) {
for (IssueTypeVo issueTypeVo : issueTypeVos){
IssueType issueType = this.getIssueType(issueTypeVo.getId());
@@ -255,7 +254,7 @@
issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
}
}
- }
+ }*/
// �씠�뒋 �쑀�삎 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@Override
@@ -278,7 +277,7 @@
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
- CompanyField companyField = issueType.getCompanyField();
+ /*CompanyField companyField = issueType.getCompanyField();
if(companyField != null){
issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
}
@@ -289,7 +288,7 @@
HostingField hostingField = issueType.getHostingField();
if (hostingField != null){
issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
- }
+ }*/
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -318,7 +317,7 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- if(issueTypeForm.getCompanyId() != null){
+ /*if(issueTypeForm.getCompanyId() != null){
CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
issueType.setCompanyField(companyField);
}
@@ -329,7 +328,10 @@
if(issueTypeForm.getHostingId() != null) {
HostingField hostingField = this.hostingFieldService.getHosting(issueTypeForm.getHostingId());
issueType.setHostingField(hostingField);
- }
+ }*/
+ issueType.setCompanyYn(issueTypeForm.getCompanyYn());
+ issueType.setIspYn(issueTypeForm.getIspYn());
+ issueType.setHostingYn(issueTypeForm.getHostingYn());
this.issueTypeRepository.saveAndFlush(issueType);
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
index 3028850..6ef3ea0 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
@@ -18,9 +18,9 @@
private String deep; // �긽�꽭 議고쉶�뿉�꽌 媛��졇�삱 �뜲�씠�꽣�쓽 醫낅쪟瑜� 寃곗젙�븳�떎.
private boolean UseProject = false; // �봽濡쒖젥�듃�뿉�꽌 �궗�슜以묒씤 �씠�뒋���엯�쓣 媛��졇�삱�븣 �궗�슜
- private Long companyId;
- private Long ispId;
- private Long hostingId;
+ private String companyYn;
+ private String ispYn;
+ private String hostingYn;
public IssueTypeCondition(){}
@@ -96,27 +96,27 @@
UseProject = useProject;
}
- public Long getCompanyId() {
- return companyId;
+ public String getCompanyYn() {
+ return companyYn;
}
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
+ public void setCompanyYn(String companyYn) {
+ this.companyYn = companyYn;
}
- public Long getIspId() {
- return ispId;
+ public String getIspYn() {
+ return ispYn;
}
- public void setIspId(Long ispId) {
- this.ispId = ispId;
+ public void setIspYn(String ispYn) {
+ this.ispYn = ispYn;
}
- public Long getHostingId() {
- return hostingId;
+ public String getHostingYn() {
+ return hostingYn;
}
- public void setHostingId(Long hostingId) {
- this.hostingId = hostingId;
+ public void setHostingYn(String hostingYn) {
+ this.hostingYn = hostingYn;
}
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
index bbeb99a..d903b49 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
@@ -17,9 +17,9 @@
private String color;
private Long workflowId;
private Long projectId;
- private Long companyId;
- private Long ispId;
- private Long hostingId;
+ private String companyYn;
+ private String ispYn;
+ private String hostingYn;
private List<Long> removeIds = Lists.newArrayList();
public IssueTypeForm(){}
@@ -94,27 +94,27 @@
this.projectId = projectId;
}
- public Long getCompanyId() {
- return companyId;
+ public String getCompanyYn() {
+ return companyYn;
}
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
+ public void setCompanyYn(String companyYn) {
+ this.companyYn = companyYn;
}
- public Long getIspId() {
- return ispId;
+ public String getIspYn() {
+ return ispYn;
}
- public void setIspId(Long ispId) {
- this.ispId = ispId;
+ public void setIspYn(String ispYn) {
+ this.ispYn = ispYn;
}
- public Long getHostingId() {
- return hostingId;
+ public String getHostingYn() {
+ return hostingYn;
}
- public void setHostingId(Long hostingId) {
- this.hostingId = hostingId;
+ public void setHostingYn(String hostingYn) {
+ this.hostingYn = hostingYn;
}
}
diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index 951923c..bcd6835 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -207,7 +207,7 @@
INDEX `departmentIdIndex` (`department_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
--- issue_type �뀒�씠釉� �뾽泥�,ISP,�샇�뒪�똿 ID 而щ읆 異붽�
-ALTER TABLE `issue_type` ADD COLUMN `company_id` BIGINT(20) NULL;
-ALTER TABLE `issue_type` ADD COLUMN `isp_id` BIGINT(20) NULL;
-ALTER TABLE `issue_type` ADD COLUMN `hosting_id` BIGINT(20) NULL;
\ No newline at end of file
+-- issue_type �뀒�씠釉� �뾽泥�,ISP,�샇�뒪�똿 而щ읆 異붽�
+ALTER TABLE `issue_type` ADD COLUMN `company_yn` VARCHAR(1) NOT NULL DEFAULT 'N';
+ALTER TABLE `issue_type` ADD COLUMN `isp_yn` VARCHAR(1) NOT NULL DEFAULT 'N';
+ALTER TABLE `issue_type` ADD COLUMN `hosting_yn` VARCHAR(1) NOT NULL DEFAULT 'N';
\ No newline at end of file
--
Gitblit v1.8.0