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 | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index 5a6f802..f0eccc6 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -5,8 +5,12 @@
import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.domain.Workflow;
import kr.wisestone.owl.vo.IssueVo;
+import kr.wisestone.owl.web.condition.ApiMonitorCondition;
+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;
import org.springframework.data.domain.Pageable;
@@ -22,11 +26,25 @@
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 addDownIssue(Map<String, Object> resJsonData, IssueForm issueForm, List<MultipartFile> files);
+
+ Issue addRelIssue(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;
+
+ List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files);
+
+ List<Issue> findIssue(IssueApiForm issueApiform);
List<IssueVo> findIssue(Map<String, Object> resJsonData,
@@ -42,9 +60,15 @@
Issue modifyIssue(IssueForm issueForm, List<MultipartFile> files);
+ Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
+
void removeIssues(IssueForm issueForm);
- void modifyIssueStatus(IssueForm issueForm);
+ void removeAllIssues(IssueForm issueForm);
+
+ void removeDownIssues(IssueForm issueForm);
+
+ void modifyIssueStatus(IssueForm issueForm, User user);
Issue getIssue(Long taskId);
@@ -64,15 +88,15 @@
ModelAndView downloadExcelTemplate(HttpServletRequest request, Model model);
- void importExcel(MultipartFile multipartFile) throws Exception;
+ void importExcel(IssueForm issueForm, MultipartFile multipartFile) throws Exception;
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, List<MultipartFile> files);
void reservationIssue();
@@ -82,11 +106,13 @@
void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);
- //void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable);
+ void findReadyDepartments(Map<String, Object> resJsonData, DepartmentCondition make, Pageable pageable);
- /*void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params);
+ void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);
- void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params);
+ void setCountDownIssues(List<IssueVo> issueVos);
- void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params);*/
+ void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap);
+
+ void sendCommonEmail(EmailCommonForm make, List<MultipartFile> files);
}
--
Gitblit v1.8.0