From 599c3777e9f82e443b2f213527f5af24f4fd907d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 17:28:15 +0900
Subject: [PATCH] 프로젝트 백엔드 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 111 insertions(+), 0 deletions(-)
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 c32c1ee..5e457e9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -43,7 +43,19 @@
private WorkflowService workflowService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private WorkspaceService workspaceService;
+
+ @Autowired
+ private CompanyFieldService companyFieldService;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
@Autowired
private IssueTypeMapper issueTypeMapper;
@@ -108,7 +120,21 @@
issueType.setWorkspace(workspace);
Workflow workflow = this.workflowService.getWorkflow(issueTypeForm.getWorkflowId());
issueType.setWorkflow(workflow);
+ Project project = this.projectService.getProject(issueTypeForm.getProjectId());
+ issueType.setProject(project);
+ 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);
}
@@ -166,6 +192,11 @@
this.setUseIssueTypeByWorkflow(issueTypeVos);
}
+ this.setUseIssueTypeByProject(issueTypeVos);
+ /*this.setUseIssueTypeByCompanyField(issueTypeVos);
+ this.setUseIssueTypeByIspField(issueTypeVos);
+ this.setUseIssueTypeByHostingField(issueTypeVos);*/
+
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -182,6 +213,49 @@
}
}
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �봽濡쒖젥�듃 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUseIssueTypeByProject(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos) {
+ IssueType issueType = this.getIssueType(issueTypeVo.getId());
+
+ Project project = issueType.getProject();
+ if (project != null) {
+ issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
+ }
+ }
+ }
+
+ /*// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뾽泥� �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUseIssueTypeByCompanyField(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos){
+ IssueType issueType = this.getIssueType(issueTypeVo.getId());
+ CompanyField companyField = issueType.getCompanyField();
+ if(companyField != null){
+ issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
+ }
+ }
+ }
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 ISP �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUseIssueTypeByIspField(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos){
+ IssueType issueType = this.getIssueType(issueTypeVo.getId());
+ IspField ispField = issueType.getIspField();
+ if(ispField != null){
+ issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
+ }
+ }
+ }
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �샇�뒪�똿 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUseIssueTypeByHostingField(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos){
+ IssueType issueType = this.getIssueType(issueTypeVo.getId());
+ HostingField hostingField = issueType.getHostingField();
+ if(hostingField != null){
+ issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
+ }
+ }
+ }*/
+
// �씠�뒋 �쑀�삎 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
@@ -197,6 +271,24 @@
issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
break;
}
+
+ Project project = issueType.getProject();
+ if (project != null) {
+ issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
+ }
+
+ /*CompanyField companyField = issueType.getCompanyField();
+ if(companyField != null){
+ issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
+ }
+ IspField ispField = issueType.getIspField();
+ if (ispField != null){
+ issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
+ }
+ HostingField hostingField = issueType.getHostingField();
+ if (hostingField != null){
+ issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
+ }*/
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -222,6 +314,25 @@
ConvertUtil.copyProperties(issueTypeForm, issueType, "id", "issueTypeType");
issueType.setWorkflow(workflow);
+ 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);
+ }*/
+ issueType.setCompanyYn(issueTypeForm.getCompanyYn());
+ issueType.setIspYn(issueTypeForm.getIspYn());
+ issueType.setHostingYn(issueTypeForm.getHostingYn());
+
this.issueTypeRepository.saveAndFlush(issueType);
return issueType;
--
Gitblit v1.8.0