From d25c62b6ff3ef7637f9358cfb0782c6706c9b55d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 10:13:00 +0900
Subject: [PATCH] 이슈 메일 전송 이력 남기기 완료 * 바로 이력이 안남겨지는 문제 해결필요(현재 새로고침을 해야 이력이 보임)
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
index 615b48b..d0624c9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -63,13 +63,22 @@
@Override
@Transactional
public void addIssueHistory(Issue issue, IssueHistoryType issueHistoryType, String issueChangeDescription) {
+ User user = this.webAppUtil.getLoginUserObject();
+ addIssueHistory(issue, user, issueHistoryType, issueChangeDescription);
+ }
+
+ // �씠�젰 �깮�꽦
+ @Override
+ @Transactional
+ public void addIssueHistory(Issue issue, User user, IssueHistoryType issueHistoryType, String issueChangeDescription) {
IssueHistory issueHistory = new IssueHistory();
issueHistory.setIssue(issue);
issueHistory.setProject(issue.getProject());
issueHistory.setIssueHistoryType(issueHistoryType);
StringBuilder description = new StringBuilder();
// �씠�젰 �젙蹂대�� 留뚮뱾�뼱 �궦�떎.
- this.makeDescription(description, issueHistoryType, issueChangeDescription);
+
+ this.makeDescription(user, description, issueHistoryType, issueChangeDescription);
issueHistory.setDescription(description.toString());
this.issueHistoryRepository.saveAndFlush(issueHistory);
@@ -81,6 +90,13 @@
// �씠�젰 �젙蹂대�� 留뚮뱾�뼱 �궦�떎.
@Override
public void makeDescription(StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription) {
+ User user = this.webAppUtil.getLoginUserObject();
+ makeDescription(user, description, issueHistoryType, issueChangeDescription);
+ }
+
+ // �씠�젰 �젙蹂대�� 留뚮뱾�뼱 �궦�떎.
+ @Override
+ public void makeDescription(User user, StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription) {
description.append("<div class=\"activity-text\">");
// �깮�꽦, �닔�젙, �궘�젣�뿉 ���빐 湲곕줉�쓣 �궓湲대떎.
@@ -90,9 +106,9 @@
description.append("<span class='activity-timestamp'>");
description.append(DateUtil.convertDateToStr(new Date()));
description.append(" (");
- description.append(this.webAppUtil.getLoginUser().getName());
+ description.append(user.getName());
description.append(" - ");
- description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
description.append(")");
description.append("</span></h6>");
break;
@@ -103,10 +119,10 @@
description.append(DateUtil.convertDateToStr(new Date()));
description.append(" (");
- if (this.webAppUtil.getLoginUser() != null) {
- description.append(this.webAppUtil.getLoginUser().getName());
+ if (user != null) {
+ description.append(user.getName());
description.append(" - ");
- description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
}
else {
description.append("OWL-ITS-SYSTEM");
@@ -124,11 +140,33 @@
description.append("<span class=\"activity-timestamp\">");
description.append(DateUtil.convertDateToStr(new Date()));
description.append(" (");
- description.append(this.webAppUtil.getLoginUser().getName());
+ description.append(user.getName());
description.append(" - ");
- description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
description.append(")");
description.append("</span></h6>");
+ break;
+
+ case SEND:
+ description.append("<h6 class=\"creat\"><span class=\"dot\"></span><span translate=\"common.sendMailIssue\">�씠�뒋 硫붿씪 �쟾�넚</span>");
+ description.append("<span class=\"activity-timestamp\">");
+ description.append(DateUtil.convertDateToStr(new Date()));
+ description.append(" (");
+
+ if (user != null) {
+ description.append(user.getName());
+ description.append(" - ");
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
+ }
+ else {
+ description.append("OWL-ITS-SYSTEM");
+ description.append(" - ");
+ description.append(this.systemEmail);
+ }
+
+ description.append(")");
+ description.append("</span></h6>");
+ description.append(issueChangeDescription);
break;
}
@@ -477,6 +515,15 @@
}else {
description.append("<span translate=\"issue.downIssueRemoveHistory\">�븯�쐞 �씪媛먯씠 �궘�젣�릺�뿀�뒿�땲�떎. </span>");
description.append("<span class=\"text-primary bold\"> > " + issue.getTitle() + "</span>");
+ }
+ }
+
+ // �씠�뒋 硫붿씪 �쟾�넚 �젙蹂대�� 湲곕줉�븳�떎.
+ @Override
+ public void detectSendIssueMail(IssueHistoryType type, IssueForm issueForm, StringBuilder description) {
+ if (type == IssueHistoryType.SEND) {
+ description.append("<span translate=\"issue.sendIssueMailHistory\">�씠�뒋 硫붿씪 �쟾�넚�쓣 �셿猷뚰뻽�뒿�땲�떎. </span>");
+ description.append("<span class=\"text-primary bold\"> > " + CommonUtil.decryptAES128(issueForm.getSendEmails().toString()) + "</span>");
}
}
@@ -926,6 +973,12 @@
if (StringUtils.isEmpty(value)) {
switch(customFieldType) {
case INPUT:
+ case NUMBER:
+ case DATETIME:
+ case IP_ADDRESS:
+ case EMAIL:
+ case SITE:
+ case TEL:
result = "<span translate=\"common.noValueEntered\">�엯�젰�븳 媛믪씠 �뾾�뒿�땲�떎.</span>";
break;
case SINGLE_SELECT:
--
Gitblit v1.8.0