From 70e3ad43e441d07d16c7e4e1af0e093befd62c01 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 27 12월 2021 19:36:11 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/IssueService.java | 11 ++++++++++- 1 files changed, 10 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 9d252a4..bb41933 100644 --- a/src/main/java/kr/wisestone/owl/service/IssueService.java +++ b/src/main/java/kr/wisestone/owl/service/IssueService.java @@ -6,6 +6,7 @@ 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.EmailTemplateForm; @@ -24,13 +25,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,7 +87,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); @@ -98,6 +105,8 @@ 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); -- Gitblit v1.8.0