From 988b102742495caf8e347986ab402a7512d6fc17 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 18:03:06 +0900
Subject: [PATCH] 이슈목록 - 테이블표시설정에 프로젝트에서 설정한 사용자정의필드만 가져오기
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
index ce67e51..78286d0 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
@@ -3,6 +3,7 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.mapper.IssueTypeCustomFieldMapper;
import kr.wisestone.owl.repository.IssueTypeCustomFieldRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
@@ -30,10 +31,16 @@
private IssueTypeCustomFieldRepository issueTypeCustomFieldRepository;
@Autowired
+ private IssueTypeCustomFieldMapper issueTypeCustomFieldMapper;
+
+ @Autowired
private ProjectService projectService;
@Autowired
private IssueTypeService issueTypeService;
+
+ @Autowired
+ private UserService userService;
@Autowired
private CustomFieldService customFieldService;
@@ -166,6 +173,15 @@
issueTypeCustomFieldVo.setCustomFieldVo(customFieldVo);
issueTypeCustomFieldVo.setFieldOption(issueTypeCustomField.getFieldOption());
issueTypeCustomFieldVo.setChecked(issueTypeCustomField.getFieldOption().equals(IssueTypeCustomField.FIELD_OPTION_Y)); // �솕硫댁뿉�꽌 �샃�뀡 泥댄겕�릺�룄濡� checked �뿉 媛� �뀑�똿
+
+ List<IssueCustomFieldValue> issueCustomFieldValues= this.issueCustomFieldValueService.findByCustomFieldId(issueTypeCustomField.getCustomField());
+ if(issueCustomFieldValues != null && issueCustomFieldValues.size()>0){
+ for(IssueCustomFieldValue issueCustomFieldValue : issueCustomFieldValues){
+ if(issueCustomFieldValue.getIssueTypeCustomField().getId().equals(issueTypeCustomField.getId())){
+ issueTypeCustomFieldVo.setUseValue(true);
+ }
+ }
+ }
issueTypeCustomFieldVos.add(issueTypeCustomFieldVo);
}
@@ -174,6 +190,22 @@
return issueTypeCustomFieldVos;
}
+ @Override
+ @Transactional(readOnly = true)
+ public List<IssueTypeCustomFieldVo> findCustomFieldByIssueType(Map<String, Object> resJsonData, IssueTypeCustomFieldCondition condition) {
+ List<IssueTypeCustomFieldVo> issueTypeCustomFieldVos = Lists.newArrayList();
+
+ IssueType issueType = this.issueTypeService.getIssueType(condition.getIssueTypeId());
+ condition.setIssueTypeId(issueType.getId());
+ condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ List<IssueTypeCustomFieldVo> issueTypeCustomFieldVo = this.issueTypeCustomFieldMapper.findByIssueType(condition);
+ if (issueTypeCustomFieldVo != null && issueTypeCustomFieldVo.size() > 0) {
+ issueTypeCustomFieldVos.addAll(issueTypeCustomFieldVo);
+ }
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeCustomFieldVos);
+ return issueTypeCustomFieldVos;
+ }
+
// �씠�뒋 excel template download �뿉�꽌 �궗�슜
@Override
@Transactional(readOnly = true)
--
Gitblit v1.8.0