From a5280304e375cf843a00eae56bd58a2c72a8d1ef Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 일, 28 11월 2021 01:36:39 +0900
Subject: [PATCH] 이슈 상세 유형별 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 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 aa9ff25..94e0681 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -1,6 +1,7 @@
 package kr.wisestone.owl.service.impl;
 
 import kr.wisestone.owl.domain.*;
+import kr.wisestone.owl.domain.enumType.IssueHistoryType;
 import kr.wisestone.owl.mapper.IssueCompanyMapper;
 import kr.wisestone.owl.repository.IssueCompanyRepository;
 import kr.wisestone.owl.service.*;
@@ -28,6 +29,9 @@
     private CompanyFieldService companyFieldService;
 
     @Autowired
+    private IssueHistoryService issueHistoryService;
+
+    @Autowired
     private IssueCompanyMapper issueCompanyMapper;
 
     @Override
@@ -44,18 +48,33 @@
                 Map<String, Object> param = issueCompanyFields.get(0);
 
                 if (param != null) {
-                    IssueCompany newIssueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
-                    newIssueCompany.setIssue(issue);
-                    CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId"));
-                    newIssueCompany.setCompanyField(companyField);
+                    CompanyField companyField = this.companyFieldService.getCompany(MapUtil.getLong(param, "companyId")); //companyId 媛��졇�삤湲�
 
                     Set<IssueCompany> issueCompanies = issue.getIssueCompanies();
-                    if (issueCompanies != null && issueCompanies.size() > 0) {
-                        IssueCompany oldIssueCompany = issueCompanies.iterator().next();
-                        ConvertUtil.copyProperties(newIssueCompany, oldIssueCompany);
-                    }
+                    IssueCompany issueCompany = null;
+                    if (issueCompanies != null && issueCompanies.size() > 0) { //�닔�젙 �븷 寃쎌슦
+                        issueCompany = issueCompanies.iterator().next();
+                        // 蹂�寃� �씠�젰
+                        StringBuilder sb = new StringBuilder();
+                        issueHistoryService.detectIssueCompany(IssueHistoryType.MODIFY, param, issueCompany, sb);
+                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
 
-                    this.issueCompanyRepository.saveAndFlush(newIssueCompany);
+                        issueCompany.setCompanyField(companyField);
+                        issueCompany.setName(MapUtil.getString(param, "name"));
+                        issueCompany.setEmail(MapUtil.getString(param, "email"));
+                        issueCompany.setManager(MapUtil.getString(param, "manager"));
+                        issueCompany.setTel(MapUtil.getString(param, "tel"));
+                        issueCompany.setMemo(MapUtil.getString(param, "memo"));
+                    } else  { //異붽� �븷 寃쎌슦
+                        issueCompany = ConvertUtil.convertMapToClass(param, IssueCompany.class);
+                        issueCompany.setIssue(issue);
+                        issueCompany.setCompanyField(companyField);
+                        // 異붽� �씠�젰
+                        StringBuilder sb = new StringBuilder();
+                        issueHistoryService.detectIssueCompany(IssueHistoryType.ADD, param, issueCompany, sb);
+                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+                    }
+                    this.issueCompanyRepository.saveAndFlush(issueCompany);
 
                 }
             }

--
Gitblit v1.8.0