From e09c34e7f0e23f59a3dd3129e4117a3184e0ba97 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 11:20:24 +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 | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index 671e472..f63c731 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -2,10 +2,14 @@
import kr.wisestone.owl.domain.Issue;
import kr.wisestone.owl.domain.IssueType;
+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;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -20,7 +24,22 @@
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 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,
IssueCondition condition, Pageable pageable);
@@ -35,9 +54,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);
@@ -61,9 +86,11 @@
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 reservationIssue();
@@ -73,11 +100,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