From d438f9c81cffd2e2cbec48150b43a5a89c9ab749 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 16 2월 2022 15:56:56 +0900 Subject: [PATCH] - 하위이슈 직접 생성 시 프로젝트 변경 못하도록 수정 - 연관이슈 직접 생성 시 프로젝트 변경 할 경우 이슈타입도 변경 되도록 수정 --- src/main/java/kr/wisestone/owl/service/IssueService.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java index d3ae7fb..1223244 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; @@ -24,13 +26,19 @@ void addIssueVersion(Long id); + void addIssueVersion(Long id, Long userId); + Issue addIssue(IssueForm issueForm, List<MultipartFile> files); Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); 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; @@ -80,15 +88,15 @@ 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); - void setIssueDetail(IssueVo issueVo, Issue issue); + void setIssueDetail(IssueVo issueVo, Issue issue, User user); void sendIssueEmail(IssueForm issueForm); - void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm); + void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files); void reservationIssue(); @@ -98,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, List<MultipartFile> files); } -- Gitblit v1.8.0