From 3da71368d451c455872a6ca114c0540e65308aef Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 28 12월 2021 15:32:43 +0900 Subject: [PATCH] 공지사항,Faq,가이드,Qna 통합 수정 - 일반회원은 faq,가이드 활성화 된 게시글만 보이기 - 엑셀다운,삭제 기능 추가(기존에 없었음) - 삭제,수정 시 권한 체크 --- 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