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 | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 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 5e900fa..83cd8b2 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -6,8 +6,11 @@
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;
@@ -23,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,
@@ -43,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);
@@ -65,15 +88,17 @@
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 setIssueDetail(IssueVo issueVo, Issue issue, User user, boolean hideCompleteIssue);
void sendIssueEmail(IssueForm issueForm);
- void sendIssueEmailPartners(IssueForm issueForm);
+ void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files);
void reservationIssue();
@@ -83,5 +108,13 @@
void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);
+ void findReadyDepartments(Map<String, Object> resJsonData, DepartmentCondition make, Pageable pageable);
+
void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);
+
+ void setCountDownIssues(List<IssueVo> issueVos);
+
+ void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap);
+
+ void sendCommonEmail(EmailCommonForm make, List<MultipartFile> files);
}
--
Gitblit v1.8.0