From b1d7844cb525a36b1e0e193e9e96a2531d4badeb Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 22 2월 2022 14:23:26 +0900 Subject: [PATCH] - 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 - 워크플로우에 속해있는 부서 삭제 시 팝업 메시지 수정 --- src/main/java/kr/wisestone/owl/service/IssueService.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 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..f0eccc6 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(Map<String, Object> resJsonData, IssueForm issueForm, List<MultipartFile> files); + Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); + + Issue addDownIssue(Map<String, Object> resJsonData, 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); @@ -90,7 +96,7 @@ void sendIssueEmail(IssueForm issueForm); - void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm); + void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files); void reservationIssue(); @@ -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, List<MultipartFile> files); } -- Gitblit v1.8.0