From 12e19e0b8bc5e728169dad54c132e7ccd41973a4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 3월 2022 12:55:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/IssueService.java | 12 +++++++-----
1 files changed, 7 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 c47ce15..83cd8b2 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -34,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;
@@ -56,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);
@@ -94,9 +94,11 @@
void setIssueDetail(IssueVo issueVo, Issue issue, User user);
+ void setIssueDetail(IssueVo issueVo, Issue issue, User user, boolean hideCompleteIssue);
+
void sendIssueEmail(IssueForm issueForm);
- void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm);
+ void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files);
void reservationIssue();
@@ -114,5 +116,5 @@
void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap);
- void sendCommonEmail(EmailCommonForm make);
+ void sendCommonEmail(EmailCommonForm make, List<MultipartFile> files);
}
--
Gitblit v1.8.0