From 16b795b0863f441d7b82dcee0fabc667bf54921f Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 16 12월 2021 10:01:34 +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 | 23 +++++++++++++++++++----
1 files changed, 19 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 c6f4e66..f63c731 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;
@@ -23,14 +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 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<IssueVo> findIssue(IssueApiForm issueApiform);
+ List<Issue> findIssue(IssueApiForm issueApiform);
+
List<IssueVo> findIssue(Map<String, Object> resJsonData,
IssueCondition condition, Pageable pageable);
@@ -48,6 +57,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);
@@ -73,11 +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(IssueForm issueForm);
+ void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm);
void reservationIssue();
@@ -88,4 +101,6 @@
void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);
void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);
+
+ void setCountDownIssues(List<IssueVo> issueVos);
}
--
Gitblit v1.8.0