From 3865b64f64a4954110364c2903dcb525c3c8c9bb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 18:19:52 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 83 ++++++-----------------------------------
1 files changed, 12 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 e67a094..91a2575 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -923,6 +923,7 @@
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
this.setIssueDetail(issueVo, issue); // �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
+ issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
break;
}
}
@@ -2590,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());
@@ -2611,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(EmailType.ISSUE_SEND_1.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_1, issueMap, null);
+ }else if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_2.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_2, issueMap, null);
+ }else if(issueForm.getTemplate().equals(EmailType.ISSUE_SEND_3.toString())){
+ this.systemEmailService.directEmail(ConvertUtil.ToArray(issueForm.getSendEmails()), EmailType.ISSUE_SEND_3, issueMap, null);
+ }
}
// �삁�빟 諛쒖깮 �씠�뒋瑜� �떎�뻾�븳�떎
@@ -2790,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 = �븯�쐞�씠�뒋
@@ -2819,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