From e70c36b1ff6487d36289a93b533feaf2d873432a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 09:56:03 +0900
Subject: [PATCH] 프로젝트 생성 시 기간 팝업창 표시 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java
index 789b9d4..3cc0736 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueStatusServiceImpl.java
@@ -17,6 +17,7 @@
import kr.wisestone.owl.web.form.IssueStatusForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.lang3.StringUtils;
+import org.hibernate.jdbc.Work;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,9 @@
@Autowired
private IssueStatusRepository issueStatusRepository;
+
+ @Autowired
+ private WorkflowService workflowService;
@Autowired
private WorkspaceService workspaceService;
@@ -92,6 +96,15 @@
public List<IssueStatus> findByWorkspaceId(Long workspaceId) {
return this.issueStatusRepository.findByWorkspaceId(workspaceId);
}
+
+
+ @Override
+ @Transactional(readOnly = true)
+ public List<IssueStatusVo> findByIssueTypeId(Long issueTypeId) {
+ IssueType issueType = this.issueTypeService.getIssueType(issueTypeId);
+ Workflow workflow = issueType.getWorkflow();
+ return findByWorkflowId(workflow.getId());
+ }
// �씠�뒋 �긽�깭瑜� �깮�꽦�븳�떎.
@Override
@@ -323,11 +336,11 @@
// �궘�젣�븷 �씠�뒋 �긽�깭媛� �썙�겕�뵆濡쒖슦 �뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �솗�씤�븳�떎.
this.checkUseWorkflow(issueStatus);
- // 湲곕낯�쑝濡� �젣怨듬릺�뒗 �씠�뒋 �긽�깭�뒗 �궘�젣 湲덉�
- if (issueStatus.getDefaultYn()) {
+ // 湲곕낯�쑝濡� �젣怨듬릺�뒗 �씠�뒋 �긽�깭�뒗 �궘�젣 湲덉� -> 湲곕낯�젣怨듭씠�뿬�룄 �궗�슜�븯吏� �븡�쑝硫� �궘�젣 媛��뒫�븯�룄濡� �닔�젙
+ /*if (issueStatus.getDefaultYn()) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.DEFAULT_ISSUE_STATUS_NOT_REMOVE));
- }
+ }*/
this.issueStatusRepository.delete(issueStatus);
}
--
Gitblit v1.8.0