From c3b8248962bd9b78a8207d5d275395a886d2ee5a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 15 12월 2021 10:31:02 +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 | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..9d252a4 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);
@@ -77,11 +84,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(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