From ca9b5f2ca3e6b4d15fc554ba4ce693cecaf0e881 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 24 12월 2021 16:09:36 +0900
Subject: [PATCH] 이슈 추가 시 업체정보 수동입력 가능하도록 하는 기능

---
 src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 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 7ea2290..c5203db 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.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.IspFieldForm;
+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 modifyIssueIspField(Issue issue, List<Map<String, Object>> issueIspFields) {
+    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
         if (issue != null) {
+            List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
             if (issueIspFields != null && issueIspFields.size() > 0) {
                 Map<String, Object> param = issueIspFields.get(0);
 
@@ -52,12 +55,11 @@
 
                     Set<IssueIsp> issueIsps = issue.getIssueIspFields();
                     IssueIsp issueIsp = new IssueIsp();
-
                     if (issueIsps != null && issueIsps.size() > 0) {//�닔�젙 �븷 寃쎌슦
                         issueIsp = issueIsps.iterator().next();
                         // 蹂�寃� �씠�젰
                         StringBuilder sb = new StringBuilder();
-                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, issueIsp, sb);
+                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
                         issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
 
                         issueIsp.setIspField(ispField);
@@ -76,13 +78,34 @@
                         }
                         // 異붽� �씠�젰
                         StringBuilder sb = new StringBuilder();
-                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, issueIsp, sb);
+                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, issueIsp, sb);
                         issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                     }
                     this.issueIspRepository.saveAndFlush(issueIsp);
                 }else {
                     this.issueIspRepository.deleteById(MapUtil.getLong(param, "id"));
                 }
+            } else if(issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+                IspFieldForm ispFieldForm = new IspFieldForm();
+                ispFieldForm.setName(issueForm.getIspName());
+                ispFieldForm.setCode(issueForm.getIspCode());
+                ispFieldForm.setEmail(issueForm.getIspEmail());
+                ispFieldForm.setUrl(issueForm.getIspUrl());
+                ispFieldForm.setManager(issueForm.getIspManager());
+                ispFieldForm.setTel(issueForm.getIspTel());
+                ispFieldForm.setMemo(issueForm.getIspMemo());
+
+                IspField ispField = this.ispFieldService.add(ispFieldForm);
+                IssueIsp issueIsp = ConvertUtil.copyProperties(ispFieldForm, IssueIsp.class);
+                issueIsp.setIssue(issue);
+                if (ispField != null) {
+                    issueIsp.setIspField(ispField);
+                }
+                // 異붽� �씠�젰
+                StringBuilder sb = new StringBuilder();
+                issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispField, issueIsp, sb);
+                issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+                this.issueIspRepository.saveAndFlush(issueIsp);
             }
         }
     }

--
Gitblit v1.8.0