From b72f7719cb2427912b1fba6f3abb117ffd49de49 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 24 12월 2021 16:10:24 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 8bd2b6c..0817429 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -10,6 +10,8 @@
import kr.wisestone.owl.util.MapUtil;
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.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +46,11 @@
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueHostingField(Issue issue, List<Map<String, Object>> issueIspFields) {
+ public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
if (issue != null) {
- if (issueIspFields != null && issueIspFields.size() > 0) {
- Map<String, Object> param = issueIspFields.get(0);
+ List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
+ if (issueHostingFields != null && issueHostingFields.size() > 0) {
+ Map<String, Object> param = issueHostingFields.get(0);
if (param != null && param.get("hostingId") != null && param.get("hostingId") != "") {
HostingField hostingField = this.hostingFieldService.getHosting(MapUtil.getLong(param, "hostingId"));
@@ -59,7 +62,7 @@
issueHosting = issueHostings.iterator().next();
// 蹂�寃� �씠�젰
StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, issueHosting, sb);
+ issueHistoryService.detectIssueHosting(IssueHistoryType.MODIFY, param, null, issueHosting, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
issueHosting.setHostingField(hostingField);
@@ -78,13 +81,34 @@
}
// 異붽� �씠�젰
StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, issueHosting, sb);
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, param, null, issueHosting, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
this.issueHostingRepository.saveAndFlush(issueHosting);
}else {
this.issueHostingRepository.deleteById(MapUtil.getLong(param, "id"));
}
+ } else if(issueForm.getHostingName() != null && !issueForm.getHostingName().equals("")) {
+ HostingFieldForm hostingFieldForm = new HostingFieldForm();
+ hostingFieldForm.setName(issueForm.getHostingName());
+ hostingFieldForm.setCode(issueForm.getHostingCode());
+ hostingFieldForm.setEmail(issueForm.getHostingEmail());
+ hostingFieldForm.setUrl(issueForm.getHostingUrl());
+ hostingFieldForm.setManager(issueForm.getHostingManager());
+ 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);
+ }
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueHosting(IssueHistoryType.ADD, null, hostingField, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueHostingRepository.saveAndFlush(issueHosting);
}
}
}
--
Gitblit v1.8.0