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/IssueIspServiceImpl.java | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
index b354bce..955cb24 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -95,8 +95,10 @@
IspField ispField = this.ispFieldService.getIsp(ispFieldForm.getId());
issueIsp.setIspField(ispField);
}
+
return issueIsp;
}
+
/**
* �씠�뒋 ISP 留뚮뱾湲�
@@ -110,48 +112,53 @@
return CreateIssueIsp(ispFieldForm, issue);
}
+
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
if (issue != null) {
StringBuilder sb = new StringBuilder();
+ IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
-
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
- IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
- if (issueIsp != null) {//�닔�젙 �떆
- // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
- issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-
- issueIsp.setName(MapUtil.getString(param, "name"));
- issueIsp.setEmail(MapUtil.getString(param, "email"));
- issueIsp.setCode(MapUtil.getString(param, "code"));
- issueIsp.setUrl(MapUtil.getString(param, "url"));
- issueIsp.setManager(MapUtil.getString(param, "manager"));
- issueIsp.setTel(MapUtil.getString(param, "tel"));
- issueIsp.setMemo(MapUtil.getString(param, "memo"));
+ if (issueIsp != null) {//�닔�젙 �떆
+ // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
+ issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueIspRepository.saveAndFlush(issueIsp);
+ issueIsp.setName(MapUtil.getString(param, "name"));
+ issueIsp.setEmail(MapUtil.getString(param, "email"));
+ issueIsp.setCode(MapUtil.getString(param, "code"));
+ issueIsp.setUrl(MapUtil.getString(param, "url"));
+ issueIsp.setManager(MapUtil.getString(param, "manager"));
+ issueIsp.setTel(MapUtil.getString(param, "tel"));
+ issueIsp.setMemo(MapUtil.getString(param, "memo"));
- } else { //異붽� �떆
- IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
- // 異붽� �씠�젰
- issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueIspRepository.saveAndFlush(newIssueIsp);
- }
- }
- // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
- else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+ this.issueIspRepository.saveAndFlush(issueIsp);
+
+ } else { //異붽� �떆
+ IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
+ // 異붽� �씠�젰
+ issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueIspRepository.saveAndFlush(newIssueIsp);
+ }
+ } // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
+ else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
//ISP�젙蹂� 吏곸젒 異붽�
CreateIspField(issueForm, issue);
- } else {
+ }
+ else {
this.issueIspRepository.deleteByIssueId(issue.getId());
this.issueIspRepository.flush();
+
+ if (issueIsp != null) {
+ issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ }
}
}
}
--
Gitblit v1.8.0