From 716586b849dd2368fb59a54adeda2d65122f643b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 21:07:07 +0900
Subject: [PATCH] - 이슈 수정 시 파트너 정보 수정 오류 - 이슈 상세 페이지에서 연관/하위 이슈의 파트너 정보 보여주기
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 106 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 42 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 0817429..5e55c83 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -11,6 +11,7 @@
import kr.wisestone.owl.vo.IssueHostingVo;
import kr.wisestone.owl.web.condition.IssueCondition;
import kr.wisestone.owl.web.form.HostingFieldForm;
+import kr.wisestone.owl.web.form.IspFieldForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +34,9 @@
private HostingFieldService hostingFieldService;
@Autowired
+ private IssueService issueService;
+
+ @Autowired
private IssueHistoryService issueHistoryService;
@Autowired
@@ -43,52 +47,70 @@
return this.issueHostingRepository;
}
+ /**
+ * �씠�뒋 �샇�뒪�똿 留뚮뱾湲�
+ * @param hostingFieldForm HostingFieldForm
+ * @param issue �씠�뒋
+ * @return IssueHosting
+ */
+ private IssueHosting CreateIssueHosting(HostingFieldForm hostingFieldForm, Issue issue) {
+ IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
+ issueHosting.setIssue(issue);
+ HostingField hostingField = this.hostingFieldService.getHosting(hostingFieldForm.getId());
+ if (hostingField != null) {
+ issueHosting.setHostingField(hostingField);
+ }
+ return issueHosting;
+ }
+
+
+ /**
+ * �씠�뒋 �샇�뒪�똿 留뚮뱾湲�
+ * @param hostingFieldMap Map<String, Object> hostingFieldMap
+ * @param issue �씠�뒋
+ * @return IssueHosting
+ */
+ private IssueHosting CreateIssueHosting(Map<String, Object> hostingFieldMap, Issue issue) {
+ HostingFieldForm hostingFieldForm = ConvertUtil.convertMapToClass(hostingFieldMap, HostingFieldForm.class);
+ hostingFieldForm.setId(MapUtil.getLong(hostingFieldMap, "hostingId"));
+ return CreateIssueHosting(hostingFieldForm, issue);
+ }
+
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
if (issue != null) {
List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
+ Map<String, Object> param = issueHostingFields.get(0);
+
if (issueHostingFields != null && issueHostingFields.size() > 0) {
- Map<String, Object> param = issueHostingFields.get(0);
+ IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
- if (param != null && param.get("hostingId") != null && param.get("hostingId") != "") {
- HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));
-
- Set<IssueHosting> issueHostings = issue.getIssueHostingFields();
- IssueHosting issueHosting = new IssueHosting();
-
- if (issueHostings != null && issueHostings.size() >0){//�닔�젙 �븷 寃쎌슦
- issueHosting = issueHostings.iterator().next();
- // 蹂�寃� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-
- issueHosting.setHostingField(hostingField);
- issueHosting.setName(MapUtil.getString(param, "name"));
- issueHosting.setEmail(MapUtil.getString(param, "email"));
- issueHosting.setCode(MapUtil.getString(param, "code"));
- issueHosting.setUrl(MapUtil.getString(param, "url"));
- issueHosting.setManager(MapUtil.getString(param, "manager"));
- issueHosting.setTel(MapUtil.getString(param, "tel"));
- issueHosting.setMemo(MapUtil.getString(param, "memo"));
- }else{//異붽� �븷 寃쎌슦
- issueHosting = ConvertUtil.convertMapToClass(param, IssueHosting.class);
- issueHosting.setIssue(issue);
- if (hostingField != null) {
- issueHosting.setHostingField(hostingField);
- }
- // 異붽� �씠�젰
- StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, issueHosting, sb);
- issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- }
+ if (issueHosting != null) { //�닔�젙 �떆
+ issueHosting.setName(MapUtil.getString(param, "name"));
+ issueHosting.setEmail(MapUtil.getString(param, "email"));
+ issueHosting.setCode(MapUtil.getString(param, "code"));
+ issueHosting.setUrl(MapUtil.getString(param, "url"));
+ issueHosting.setManager(MapUtil.getString(param, "manager"));
+ issueHosting.setTel(MapUtil.getString(param, "tel"));
+ issueHosting.setMemo(MapUtil.getString(param, "memo"));
+ // 蹂�寃� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
this.issueHostingRepository.saveAndFlush(issueHosting);
- }else {
- this.issueHostingRepository.deleteById(MapUtil.getLong(param, "id"));
+
+ } else { //異붽� �떆
+ IssueHosting newIssueHosting = CreateIssueHosting(param, issue);
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
} else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+ // issueHosting �븘�뱶 �뤌 留뚮뱾湲�
HostingFieldForm hostingFieldForm = new HostingFieldForm();
hostingFieldForm.setName(issueForm.getHostingName());
hostingFieldForm.setCode(issueForm.getHostingCode());
@@ -98,17 +120,17 @@
hostingFieldForm.setTel(issueForm.getHostingTel());
hostingFieldForm.setMemo(issueForm.getHostingMemo());
- HostingField hostingField = this.hostingFieldService.add(hostingFieldForm);
- IssueHosting issueHosting = ConvertUtil.copyProperties(hostingFieldForm, IssueHosting.class);
- issueHosting.setIssue(issue);
- if (hostingField != null) {
- issueHosting.setHostingField(hostingField);
+ IssueHosting newIssueHosting = CreateIssueHosting(hostingFieldForm, issue);
+ HostingField hostingField = new HostingField();
+ if (newIssueHosting.getHostingField() == null) { // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 �샇�뒪�똿 紐⑸줉�뿉 異붽�
+ hostingField = this.hostingFieldService.add(hostingFieldForm);
+ newIssueHosting.setHostingField(hostingField);
}
// 異붽� �씠�젰
StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingField, issueHosting, sb);
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, newIssueHosting, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
- this.issueHostingRepository.saveAndFlush(issueHosting);
+ this.issueHostingRepository.saveAndFlush(newIssueHosting);
}
}
}
--
Gitblit v1.8.0