From b4a3d2e4dca6417f7891179808773d62202ddeba Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 일, 12 12월 2021 22:17:56 +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 | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java index 5a6f802..d3ae7fb 100644 --- a/src/main/java/kr/wisestone/owl/service/IssueService.java +++ b/src/main/java/kr/wisestone/owl/service/IssueService.java @@ -5,8 +5,10 @@ import kr.wisestone.owl.domain.User; 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.IssueCondition; import kr.wisestone.owl.web.condition.ProjectCondition; +import kr.wisestone.owl.web.form.EmailTemplateForm; import kr.wisestone.owl.web.form.IssueApiForm; import kr.wisestone.owl.web.form.IssueForm; import org.springframework.data.domain.Pageable; @@ -26,7 +28,15 @@ Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); - Issue addApiIssue(IssueApiForm issueApiForm); + Issue addRelIssue(IssueForm issueForm, List<MultipartFile> files); + + Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); + + List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException; + + List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files); + + List<Issue> findIssue(IssueApiForm issueApiform); List<IssueVo> findIssue(Map<String, Object> resJsonData, @@ -42,9 +52,15 @@ Issue modifyIssue(IssueForm issueForm, List<MultipartFile> files); + Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); + void removeIssues(IssueForm issueForm); - void modifyIssueStatus(IssueForm issueForm); + void removeAllIssues(IssueForm issueForm); + + void removeDownIssues(IssueForm issueForm); + + void modifyIssueStatus(IssueForm issueForm, User user); Issue getIssue(Long taskId); @@ -72,7 +88,7 @@ void sendIssueEmail(IssueForm issueForm); - void sendIssueEmailPartners(IssueForm issueForm); + void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm); void reservationIssue(); @@ -82,11 +98,7 @@ void findPartner(Map<String, Object> resJsonData, Map<String, Object> params); - //void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable); + void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData); - /*void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params); - - void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params); - - void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params);*/ + void setCountDownIssues(List<IssueVo> issueVos); } -- Gitblit v1.8.0