From 9c283e735476f1106262de58b4042f30acf61a45 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 14:54:27 +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 |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index 8bc8349..abf54aa 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -6,6 +6,7 @@
 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.EmailTemplateForm;
@@ -23,6 +24,8 @@
 public interface IssueService extends AbstractService<Issue, Long, JpaRepository<Issue, Long>>{
 
     void addIssueVersion(Long id);
+
+    void addIssueVersion(Long id, Long userId);
 
     Issue addIssue(IssueForm issueForm, List<MultipartFile> files);
 
@@ -84,7 +87,7 @@
 
     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);
 
@@ -102,7 +105,11 @@
 
     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);
 }

--
Gitblit v1.8.0