From e84c3729557624f91782c0c5d35330e661d86c0b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 18 1월 2022 11:20:06 +0900
Subject: [PATCH] 이슈상세 - 개별 메일 보내기 코드 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
index 21f5d4c..40ec470 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -69,13 +69,14 @@
// �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
if (newIssueHosting.getHostingField() == null) {
- hostingField = this.hostingFieldService.add(hostingFieldForm);
- newIssueHosting.setHostingField(hostingField);
IssueHosting oldIssueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
+ hostingField = this.hostingFieldService.add(hostingFieldForm);
+ hostingFieldForm.setId(hostingField.getId());
if (oldIssueHosting != null) {
this.issueHostingRepository.deleteById(oldIssueHosting.getId());
issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, null, hostingFieldForm, oldIssueHosting, sb);
} else {
+ newIssueHosting.setHostingField(hostingField);
issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingFieldForm, newIssueHosting, sb);
}
}
@@ -118,18 +119,17 @@
@Transactional
public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
if (issue != null) {
+ IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
StringBuilder sb = new StringBuilder();
List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
-
if (issueHostingFields != null && issueHostingFields.size() > 0) {
Map<String, Object> param = issueHostingFields.get(0);
- IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
if (issueHosting != null) { //�닔�젙 �떆
// 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-
+
issueHosting.setName(MapUtil.getString(param, "name"));
issueHosting.setEmail(MapUtil.getString(param, "email"));
issueHosting.setCode(MapUtil.getString(param, "code"));
@@ -137,7 +137,7 @@
issueHosting.setManager(MapUtil.getString(param, "manager"));
issueHosting.setTel(MapUtil.getString(param, "tel"));
issueHosting.setMemo(MapUtil.getString(param, "memo"));
-
+
this.issueHostingRepository.saveAndFlush(issueHosting);
} else { //異붽� �떆
@@ -147,12 +147,17 @@
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
- } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+ }else if (issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
// �샇�뒪�똿 �젙蹂� 吏곸젒 異붽�
CreateHostingField(issueForm, issue);
} else {
this.issueHostingRepository.deleteByIssueId(issue.getId());
this.issueHostingRepository.flush();
+
+ if (issueHosting != null) {
+ issueHistoryService.detectIssueHosting(IssueHistoryType.DELETE, null, null, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ }
}
}
}
--
Gitblit v1.8.0