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 | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index ac1c4bb..d3ae7fb 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -8,6 +8,7 @@
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;
@@ -31,10 +32,12 @@
Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
- Issue addApiIssue(IssueApiForm issueApiForm);
+ List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException;
+
List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files);
- List<IssueVo> findIssue(IssueApiForm issueApiform);
+ List<Issue> findIssue(IssueApiForm issueApiform);
+
List<IssueVo> findIssue(Map<String, Object> resJsonData,
IssueCondition condition, Pageable pageable);
@@ -52,6 +55,10 @@
Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
void removeIssues(IssueForm issueForm);
+
+ void removeAllIssues(IssueForm issueForm);
+
+ void removeDownIssues(IssueForm issueForm);
void modifyIssueStatus(IssueForm issueForm, User user);
@@ -81,7 +88,7 @@
void sendIssueEmail(IssueForm issueForm);
- void sendIssueEmailPartners(IssueForm issueForm);
+ void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm);
void reservationIssue();
@@ -93,5 +100,5 @@
void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);
- void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos);
+ void setCountDownIssues(List<IssueVo> issueVos);
}
--
Gitblit v1.8.0