From c23fb74967932d628e1379a8a78a7ab5aa5c9c97 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 17:03:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/IssueService.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index bbccd25..fff9510 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;
@@ -22,6 +25,18 @@
Issue addIssue(IssueForm issueForm, List<MultipartFile> files);
+ Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
+
+ Issue addRelIssue(IssueForm issueForm, List<MultipartFile> files);
+
+ Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
+
+ List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException;
+
+ List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files);
+
+ List<IssueVo> findIssue(IssueApiForm issueApiform);
+
List<IssueVo> findIssue(Map<String, Object> resJsonData,
IssueCondition condition, Pageable pageable);
@@ -35,9 +50,11 @@
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 modifyIssueStatus(IssueForm issueForm, User user);
Issue getIssue(Long taskId);
@@ -51,7 +68,7 @@
void modifyMultiIssueStatus(IssueForm issueForm);
- //void modifyIssueUser(IssueForm issueForm);
+ void modifyIssueUser(IssueForm issueForm);
void modifyIssueDepartment(IssueForm issueForm);
@@ -65,7 +82,17 @@
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);
+
+ void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos);
}
--
Gitblit v1.8.0