From e48d62efe756754237fb10c263f24c4f51587ad0 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 01 12월 2021 18:28:30 +0900
Subject: [PATCH] 이메일 수정 진행중

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |   82 +++++-----------------------------------
 1 files changed, 11 insertions(+), 71 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 0cf87fe..62f2b00 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -2591,6 +2591,9 @@
         if (issueForm.getSendEmails().size() < 1) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
+        }else if (issueForm.getTemplate() != null){
+            throw new OwlRuntimeException(
+                    this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SELECT_TEMPLATE));
         }
 
         Issue issue = this.getIssue(issueForm.getId());
@@ -2612,8 +2615,15 @@
 
         //  �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
         log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
+        //this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND, issueMap, null);
 
-        this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND, issueMap, null);
+        if(issueForm.getTemplate().equals("SEND1")){
+            this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND_1, issueMap, null);
+        }else if(issueForm.getTemplate().equals("SEND2")){
+            this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND_2, issueMap, null);
+        }else if(issueForm.getTemplate().equals("SEND3")){
+            this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND_3, issueMap, null);
+        }
     }
 
     //  �삁�빟 諛쒖깮 �씠�뒋瑜� �떎�뻾�븳�떎
@@ -2791,7 +2801,6 @@
         StringBuilder sb = new StringBuilder();
 
         if (newParentIssueId != null) { // 異붽� �븷 寃쎌슦
-            // todo �씠�쟾 �븯�쐞 �씪媛� �엳�뒪�넗由ш린濡� �븘�슂
             parentIssue = this.getIssue(newParentIssueId); //�긽�쐞�씠�뒋(myIssue)
             issue.setParentIssue(parentIssue); //myIssue瑜� �븯�쐞�씠�뒋�쓽 �긽�쐞�씠�뒋濡� set
             this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = �븯�쐞�씠�뒋
@@ -2820,73 +2829,4 @@
             resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
         }
     }
-
-    /*@Override
-    @Transactional
-    public void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable) {
-        IssueVo issueVo = new IssueVo();
-        //Long issueId = MapUtil.getLong(params, "issueId");
-        Long issueId = condition.getId();
-
-        List<String> emailList = Lists.newArrayList();
-
-        if(issueId != null){
-            Issue issue = this.getIssue(issueId);
-            issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
-            this.setIssueCompanyField(issue, issueVo);  //�뾽泥� �젙蹂� �꽭�똿
-            this.setIssueIspField(issue, issueVo);  //ISP �젙蹂� �꽭�똿
-            this.setIssueHostingField(issue, issueVo);  //HOSTING �젙蹂� �꽭�똿
-            for(IssueCompanyVo issueCompanyVo : issueVo.getIssueCompanyVos()) {
-                emailList.add(issueCompanyVo.getEmail());
-            }
-            for(IssueIspVo issueIspVo : issueVo.getIssueIspVos()) {
-                emailList.add(issueIspVo.getEmail());
-            }
-            for(IssueHostingVo issueHostingVo : issueVo.getIssueHostingVos()) {
-                emailList.add(issueHostingVo.getEmail());
-            }
-
-        }
-
-        Long totalCount = this.issueMapper.count(condition);
-        int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
-
-        condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
-        condition.setPageSize(pageable.getPageSize());
-        //resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
-        resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
-        resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
-                totalPage, totalCount));
-    }*/
-
-    /*@Override
-    @Transactional
-    public void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params) {
-        IssueVo issueVo = new IssueVo();
-        Long issueId = MapUtil.getLong(params, "issueId");
-
-        List<String> emailList = Lists.newArrayList();
-
-        if(issueId != null){
-            Issue issue = this.getIssue(issueId);
-            issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
-            this.setIssueCompanyField(issue, issueVo);  //�뾽泥� �젙蹂� �꽭�똿
-            for(IssueCompanyVo issueCompanyVo : issueVo.getIssueCompanyVos()) {
-                emailList.add(issueCompanyVo.getEmail());
-            }
-        }
-        resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
-    }
-
-    @Override
-    @Transactional
-    public void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params) {
-
-    }
-
-    @Override
-    @Transactional
-    public void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params) {
-
-    }*/
 }

--
Gitblit v1.8.0