From 2b5c6c4c2b6d54ec4a2f2ba57561d8912065e0ee Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 19 1월 2022 15:48:28 +0900 Subject: [PATCH] - 전체프로젝트가 선택 된 상태에서 ISSUE TYPE LIST 선택 시에도 전체프로젝트로 유지되도록 수정 - 전체 프로젝트 또는 전체 이슈 일 경우에도 '이슈 만들기' 버튼 보이도록 수정(만들기 폼에서 프로젝트,이슈유형 수정가능하도록) --- src/main/java/kr/wisestone/owl/service/IssueService.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java index f63c731..1221d84 100644 --- a/src/main/java/kr/wisestone/owl/service/IssueService.java +++ b/src/main/java/kr/wisestone/owl/service/IssueService.java @@ -6,8 +6,10 @@ import kr.wisestone.owl.domain.Workflow; import kr.wisestone.owl.vo.IssueVo; import kr.wisestone.owl.web.condition.ApiMonitorCondition; +import kr.wisestone.owl.web.condition.DepartmentCondition; import kr.wisestone.owl.web.condition.IssueCondition; import kr.wisestone.owl.web.condition.ProjectCondition; +import kr.wisestone.owl.web.form.EmailCommonForm; import kr.wisestone.owl.web.form.EmailTemplateForm; import kr.wisestone.owl.web.form.IssueApiForm; import kr.wisestone.owl.web.form.IssueForm; @@ -32,7 +34,11 @@ Issue addRelIssue(IssueForm issueForm, List<MultipartFile> files); + Issue addDownIssue(IssueForm issueForm, List<MultipartFile> files); + Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); + + Issue addDownIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException; @@ -82,7 +88,7 @@ ModelAndView downloadExcelTemplate(HttpServletRequest request, Model model); - void importExcel(MultipartFile multipartFile) throws Exception; + void importExcel(IssueForm issueForm, MultipartFile multipartFile) throws Exception; List<Long> findByProjectId(Long projectId); @@ -100,7 +106,13 @@ void findPartner(Map<String, Object> resJsonData, Map<String, Object> params); + void findReadyDepartments(Map<String, Object> resJsonData, DepartmentCondition make, Pageable pageable); + void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData); void setCountDownIssues(List<IssueVo> issueVos); + + void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap); + + void sendCommonEmail(EmailCommonForm make); } -- Gitblit v1.8.0