From abebb925cfd71d15fbb8d9c940b329cda9eb34e5 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 07 12월 2021 09:34:47 +0900
Subject: [PATCH] 문의하기 버튼 숨김
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 97 insertions(+), 4 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 7b14f1d..a9ce5db 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -4,6 +4,7 @@
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
@@ -11,6 +12,7 @@
import kr.wisestone.owl.repository.IssueTypeRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.IssueTypeCondition;
import kr.wisestone.owl.web.form.IssueTypeForm;
@@ -43,7 +45,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;
@@ -75,16 +89,16 @@
switch (projectType) {
case BTS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.bug"), "", "#ff5f99")); // 踰꾧렇
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.improvement"), "", "#3598fe")); // 媛쒖꽑
+ issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99")); // 踰꾧렇
+ issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe")); // 媛쒖꽑
break;
case RMS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.requirement"), "", "#3bcde2")); // �슂援� �궗�빆
+ issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2")); // �슂援� �궗�빆
break;
case TCM_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, this.messageAccessor.message("common.testcase"), "", "#008ca7")); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
+ issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7")); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
break;
}
@@ -108,6 +122,10 @@
issueType.setWorkspace(workspace);
Workflow workflow = this.workflowService.getWorkflow(issueTypeForm.getWorkflowId());
issueType.setWorkflow(workflow);
+ Project project = this.projectService.getProject(issueTypeForm.getProjectId());
+ issueType.setProject(project);
+
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -156,7 +174,17 @@
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+
List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+ for (Map<String, Object> result : results) {
+ Long projectId = MapUtil.getLong(result, "projectId");
+ if (projectId != null) {
+ Project project = this.projectService.getProject(projectId);
+ ProjectVo projectVo = ConvertUtil.copyProperties(project, ProjectVo.class);
+ result.put("projectVo", projectVo);
+ }
+ }
+
Long totalCount = this.issueTypeMapper.count(condition);
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
List<IssueTypeVo> issueTypeVos = ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
@@ -166,12 +194,26 @@
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));
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVos);
return issueTypeVos;
+ }
+
+ // �씠�뒋 �쑀�삎 紐⑸줉�쓣 議고쉶�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public List<IssueTypeVo> findIssueType(IssueTypeCondition condition) {
+ condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+ return ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
}
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
@@ -181,6 +223,30 @@
issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
}
}
+
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �봽濡쒖젥�듃 �젙蹂대�� �뀑�똿�븳�떎.
+ 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));
+ }
+ }
+ }
+ */
// �씠�뒋 �쑀�삎 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@Override
@@ -197,6 +263,22 @@
issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
break;
}
+
+ Project project = issueType.getProject();
+ if (project != null) {
+ issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
+ }
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0;
+
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) {// 1 // 2 // 4
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);//3, 1 / 3, 2 / 3, 4
+
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
+ }
+ }
+ issueTypeVo.setUsePartnerVos(usePartnerVos);
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -222,6 +304,17 @@
ConvertUtil.copyProperties(issueTypeForm, issueType, "id", "issueTypeType");
issueType.setWorkflow(workflow);
+ Project project = this.projectService.getProject(issueTypeForm.getProjectId());
+ issueType.setProject(project);
+
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
+
+ /*if(issueTypeForm.getCompanyId() != null){
+ CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
+ issueType.setCompanyField(companyField);
+ }*/
+// issueType.setCompanyYn(issueTypeForm.getCompanyYn());
+
this.issueTypeRepository.saveAndFlush(issueType);
return issueType;
--
Gitblit v1.8.0