From b2b8a75a8f5a35717bb89a07c2fe35ea16b6a99c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 09:55:16 +0900
Subject: [PATCH] 이슈 히스토리 - 중복되어서 나오는 문제 해결 및 업체에 추가된 항목들도 변경 시 이력 남기도록 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java |   56 +++++++++++++++++++++++++-------------------------------
 1 files changed, 25 insertions(+), 31 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 955cb24..4bf324b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -49,7 +49,7 @@
      * @param issueForm IssueForm
      * @param issue Issue
      */
-    private void CreateIspField(IssueForm issueForm, Issue issue) {
+    private void CreateIspField(IssueForm issueForm, Issue issue, StringBuilder sb) {
         // issueIsp �븘�뱶 �뤌 留뚮뱾湲�
         IspFieldForm ispFieldForm = new IspFieldForm();
         ispFieldForm.setName(issueForm.getIspName());
@@ -62,7 +62,6 @@
 
         IssueIsp newIssueIsp = CreateIssueIsp(ispFieldForm, issue);
         IspField ispField = new IspField();
-        StringBuilder sb = new StringBuilder();
 
         // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆�뿉 ISP 紐⑸줉�뿉 異붽�
         if (newIssueIsp.getIspField() == null) {
@@ -77,8 +76,6 @@
                 issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, null, ispFieldForm, newIssueIsp, sb);
             }
         }
-        // 異붽� �씠�젰
-        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         this.issueIspRepository.saveAndFlush(newIssueIsp);
     }
 
@@ -116,50 +113,47 @@
     //  �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �뾽泥� 媛믪쓣 �뾽�뜲�씠�듃�븳�떎.
     @Override
     @Transactional
-    public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
+    public void modifyIssueIspField(Issue issue, IssueForm issueForm, StringBuilder sb) {
         if (issue != null) {
-            StringBuilder sb = new StringBuilder();
             IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
             List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
+
             if (issueIspFields != null && issueIspFields.size() > 0) {
                 Map<String, Object> param = issueIspFields.get(0);
 
-                    if (issueIsp != null) {//�닔�젙 �떆
-                        // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
-                        issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
-                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+                if (issueIsp != null) {//�닔�젙 �떆
+                    // 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
+                    issueHistoryService.detectIssueIsp(IssueHistoryType.MODIFY, param, null, issueIsp, sb);
 
-                        issueIsp.setName(MapUtil.getString(param, "name"));
-                        issueIsp.setEmail(MapUtil.getString(param, "email"));
-                        issueIsp.setCode(MapUtil.getString(param, "code"));
-                        issueIsp.setUrl(MapUtil.getString(param, "url"));
-                        issueIsp.setManager(MapUtil.getString(param, "manager"));
-                        issueIsp.setTel(MapUtil.getString(param, "tel"));
-                        issueIsp.setMemo(MapUtil.getString(param, "memo"));
+                    issueIsp.setName(MapUtil.getString(param, "name"));
+                    issueIsp.setEmail(MapUtil.getString(param, "email"));
+                    issueIsp.setCode(MapUtil.getString(param, "code"));
+                    issueIsp.setUrl(MapUtil.getString(param, "url"));
+                    issueIsp.setManager(MapUtil.getString(param, "manager"));
+                    issueIsp.setTel(MapUtil.getString(param, "tel"));
+                    issueIsp.setMemo(MapUtil.getString(param, "memo"));
 
-                        this.issueIspRepository.saveAndFlush(issueIsp);
+                    this.issueIspRepository.saveAndFlush(issueIsp);
 
-                    } else { //異붽� �떆
-                        IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
-                        // 異붽� �씠�젰
-                        issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
-                        issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
-                        this.issueIspRepository.saveAndFlush(newIssueIsp);
-                    }
-            } // �궗�슜�옄媛� 吏곸젒 �엯�젰�떆
-            else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
+                } else { //異붽� �떆
+                    IssueIsp newIssueIsp = CreateIssueIsp(param, issue);
+                    // 異붽� �씠�젰
+                    issueHistoryService.detectIssueIsp(IssueHistoryType.ADD, param, null, newIssueIsp, sb);
+                    this.issueIspRepository.saveAndFlush(newIssueIsp);
+                }
+
+            } else if (issueForm.getIspName() != null && !issueForm.getIspName().equals("")) {
                 //ISP�젙蹂� 吏곸젒 異붽�
-                CreateIspField(issueForm, issue);
-            }
-            else {
+                CreateIspField(issueForm, issue, sb);
+            } else {
                 this.issueIspRepository.deleteByIssueId(issue.getId());
                 this.issueIspRepository.flush();
 
                 if (issueIsp != null) {
                     issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
-                    issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
                 }
             }
+            //issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
         }
     }
 

--
Gitblit v1.8.0