From 1dad4d94cc415d2f8092aff0368744289337f504 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 화, 22 2월 2022 14:29:43 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/IssueService.java | 11 +++++++----
1 files changed, 7 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 caeca69..f0eccc6 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -9,6 +9,7 @@
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.IssueCondition;
import kr.wisestone.owl.web.condition.ProjectCondition;
+import kr.wisestone.owl.web.form.EmailCommonForm;
import kr.wisestone.owl.web.form.EmailTemplateForm;
import kr.wisestone.owl.web.form.IssueApiForm;
import kr.wisestone.owl.web.form.IssueForm;
@@ -33,11 +34,11 @@
Issue addRelIssue(IssueForm issueForm, List<MultipartFile> files);
- Issue addDownIssue(IssueForm issueForm, List<MultipartFile> files);
+ Issue addDownIssue(Map<String, Object> resJsonData, IssueForm issueForm, List<MultipartFile> files);
Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
- Issue addDownIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
+ Issue addDownIssue(Map<String, Object> resJsonData, User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException;
@@ -55,7 +56,7 @@
List<IssueVo> findChartIssue(Map<String, Object> resJsonData,
ProjectCondition condition, Pageable pageable);
- void detailIssue(Map<String, Object> resJsonData, IssueCondition issueCondition, Pageable relPageable, Pageable downPageable);
+ void detailIssue(Map<String, Object> resJsonData, IssueCondition issueCondition);
Issue modifyIssue(IssueForm issueForm, List<MultipartFile> files);
@@ -95,7 +96,7 @@
void sendIssueEmail(IssueForm issueForm);
- void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm);
+ void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files);
void reservationIssue();
@@ -112,4 +113,6 @@
void setCountDownIssues(List<IssueVo> issueVos);
void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap);
+
+ void sendCommonEmail(EmailCommonForm make, List<MultipartFile> files);
}
--
Gitblit v1.8.0