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/IssueCompanyServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
index 54e03d3..a3d2ed5 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -8,6 +8,8 @@
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.web.condition.IssueCondition;
+import kr.wisestone.owl.web.form.CompanyFieldForm;
+import kr.wisestone.owl.web.form.IssueForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +44,9 @@
// �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
@Override
@Transactional
- public void modifyIssueCompanyField(Issue issue, List<Map<String, Object>> issueCompanyFields) {
+ public void modifyIssueCompanyField(Issue issue, IssueForm issueForm) {
if (issue != null) {
+ List<Map<String, Object>> issueCompanyFields = issueForm.getIssueCompanyFields();
if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
Map<String, Object> param = issueCompanyFields.get(0);
@@ -56,7 +59,7 @@
issueCompany = issueCompanies.iterator().next();
// 蹂�寃� �씠�젰
StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, param, issueCompany, sb);
+ issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, param, null, issueCompany, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
issueCompany.setCompanyField(companyField);
@@ -74,13 +77,34 @@
}
// 異붽� �씠�젰
StringBuilder sb = new StringBuilder();
- issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, issueCompany, sb);
+ issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, null, issueCompany, sb);
issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
}
this.issueCompanyRepository.saveAndFlush(issueCompany);
} else {
this.issueCompanyRepository.deleteById(MapUtil.getLong(param, "id"));
}
+ } else if(issueForm.getCompanyName() != null && !issueForm.getCompanyName().equals("")) { //�뾽泥댁젙蹂� 吏곸젒 異붽�
+ CompanyFieldForm companyFieldForm = new CompanyFieldForm();
+ companyFieldForm.setName(issueForm.getCompanyName());
+ companyFieldForm.setEmail(issueForm.getCompanyEmail());
+ companyFieldForm.setUrl(issueForm.getCompanyUrl());
+ companyFieldForm.setManager(issueForm.getCompanyManager());
+ companyFieldForm.setTel(issueForm.getCompanyTel());
+ companyFieldForm.setMemo(issueForm.getCompanyMemo());
+
+ CompanyField companyField = this.companyFieldService.addCompany(companyFieldForm);
+
+ IssueCompany issueCompany = ConvertUtil.copyProperties(companyFieldForm, IssueCompany.class);
+ issueCompany.setIssue(issue);
+ if (companyField != null) {
+ issueCompany.setCompanyField(companyField);
+ }
+ // 異붽� �씠�젰
+ StringBuilder sb = new StringBuilder();
+ issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, null, companyField, issueCompany, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ this.issueCompanyRepository.saveAndFlush(issueCompany);
}
}
}
--
Gitblit v1.8.0