From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/IssueService.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index 59e6ba4..5e900fa 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -2,10 +2,13 @@
import kr.wisestone.owl.domain.Issue;
import kr.wisestone.owl.domain.IssueType;
+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.IssueCondition;
import kr.wisestone.owl.web.condition.ProjectCondition;
+import kr.wisestone.owl.web.form.IssueApiForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -21,6 +24,11 @@
void addIssueVersion(Long id);
Issue addIssue(IssueForm issueForm, List<MultipartFile> files);
+
+ Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
+
+ Issue addApiIssue(IssueApiForm issueApiForm);
+
List<IssueVo> findIssue(Map<String, Object> resJsonData,
IssueCondition condition, Pageable pageable);
@@ -53,6 +61,8 @@
void modifyIssueUser(IssueForm issueForm);
+ void modifyIssueDepartment(IssueForm issueForm);
+
ModelAndView downloadExcelTemplate(HttpServletRequest request, Model model);
void importExcel(MultipartFile multipartFile) throws Exception;
@@ -63,7 +73,15 @@
void sendIssueEmail(IssueForm issueForm);
+ void sendIssueEmailPartners(IssueForm issueForm);
+
void reservationIssue();
Map<String, Object> findTask(IssueCondition taskCondition);
+
+ void modifyParentIssue(IssueForm issueForm);
+
+ void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);
+
+ void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);
}
--
Gitblit v1.8.0