From ebfd37816a332308519b30af5bfb017c5052be69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 17:34:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/IssueHistoryService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
index f9417a5..3855b9f 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java
@@ -1,5 +1,6 @@
package kr.wisestone.owl.service;
+import kr.wisestone.owl.data.CheckIssueData;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.IssueHistoryType;
import kr.wisestone.owl.service.impl.IssueHistoryServiceImpl;
@@ -18,13 +19,18 @@
void addIssueHistory(Issue issue, IssueHistoryType issueHistoryType, String issueChangeDescription);
+ void addIssueHistory(Issue issue, User user, IssueHistoryType issueHistoryType, String issueChangeDescription);
+
void makeDescription(StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription);
+
+ void makeDescription(User user, StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription);
void findIssueHistory(Map<String, Object> resJsonData, IssueHistoryCondition issueHistoryCondition);
- List<IssueHistoryVo> findIssueHistory(Long issueId);
+ List<IssueHistoryVo> findIssueHistory(Issue issue);
- StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files);
+ StringBuilder detectIssueChange(Issue issue, IssueForm issueForm, Project project, IssueStatus oldIssueStatus, IssueStatus issueStatus, IssueType issueType, Priority priority, Severity severity, List<MultipartFile> files);
+ StringBuilder detectIssueChange(IssueForm issueForm, CheckIssueData data, List<MultipartFile> files);
void detectProject(Issue issue, IssueForm issueForm, StringBuilder description, Project project);
@@ -32,7 +38,7 @@
void detectIssuePriority(Issue issue, IssueForm issueForm, StringBuilder description, Priority priority);
- void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus issueStatus);
+ void detectIssueStatus(Issue issue, IssueForm issueForm, StringBuilder description, IssueStatus oldIssueStatus, IssueStatus issueStatus);
void detectReservationIssueStatus(Issue issue, StringBuilder description, IssueStatus issueStatus);
@@ -54,11 +60,14 @@
void detectDownIssues(IssueHistoryType type, Issue issue, StringBuilder description);
- void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description);
+ void detectSendIssueMail(IssueHistoryType type, IssueForm issueForm, StringBuilder description);
+ void detectSendIssueMail(IssueHistoryType type, List<String> sendMails, StringBuilder description);
- void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IssueIsp issueIsp, StringBuilder description);
+ void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyField companyField, IssueCompany issueCompany, StringBuilder description);
- void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, IssueHosting issueHosting, StringBuilder description);
+ void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspField ispField, IssueIsp issueIsp, StringBuilder description);
+
+ void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingField hostingField, IssueHosting issueHosting, StringBuilder description);
void recodeRemoveCustomFieldOptionValue(CustomField customField, String oldValue, String newValue, StringBuilder description);
--
Gitblit v1.8.0