From 174dc12380c54730014e86c8897be16389fc804f Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 21 2월 2022 11:42:38 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/domain/IssueType.java | 3 +
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 30 ++++++++------
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 42 +++++++++++---------
src/main/webapp/views/issue/issueListNormal.html | 14 +++++++
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 8 ++--
5 files changed, 60 insertions(+), 37 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java
index 9186fe0..ca2ccf4 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueType.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueType.java
@@ -57,13 +57,14 @@
public IssueType(){}
- public IssueType(Workspace workspace, Workflow workflow, String name, String description, String color, Long usePartner){
+ public IssueType(Workspace workspace, Workflow workflow, String name, String description, String color, Long usePartner, Boolean inheritPartners){
this.workspace = workspace;
this.workflow = workflow;
this.name = name;
this.description = description;
this.color = color;
this.usePartner = usePartner;
+ this.inheritPartners = inheritPartners;
}
public Long getId() {
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index e3826fd..a000400 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -98,16 +98,16 @@
switch (projectType) {
case BTS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99", 0L)); // 踰꾧렇
- issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe", 0L)); // 媛쒖꽑
+ issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99", 0L, false)); // 踰꾧렇
+ issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe", 0L, false)); // 媛쒖꽑
break;
case RMS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2", 0L)); // �슂援� �궗�빆
+ issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2", 0L, false)); // �슂援� �궗�빆
break;
case TCM_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7", 0L)); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
+ issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7", 0L, false)); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
break;
}
this.issueTypeRepository.saveAll(issueTypes);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
index 92d20d5..1004513 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -269,30 +269,34 @@
MimeMessage message = this.javaMailSender.createMimeMessage();
try {
- InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
- MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
- messageHelper.setSubject(subject);
- messageHelper.setText(content, true);
- messageHelper.setFrom(from);
- messageHelper.setTo(to);
+ if (this.emailSender != null && !this.emailSender.equals("")
+ && this.emailUserName != null && !this.emailUserName.equals("")) {
- if (multipartFiles != null && multipartFiles.size() > 0) {
- for (MultipartFile file : multipartFiles) {
- // �뙆�씪 泥⑤�
- messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
- }
- }
+ InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
+ MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
+ messageHelper.setSubject(subject);
+ messageHelper.setText(content, true);
+ messageHelper.setFrom(from);
+ messageHelper.setTo(to);
- if (filePaths != null && filePaths.length > 0) {
- for (String filePath : filePaths) {
- if (!StringUtils.isEmpty(filePath)) {
- DataSource dataSource = new FileDataSource(filePath);
- messageHelper.addAttachment(MimeUtility.encodeText(
- FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
+ if (multipartFiles != null && multipartFiles.size() > 0) {
+ for (MultipartFile file : multipartFiles) {
+ // �뙆�씪 泥⑤�
+ messageHelper.addAttachment(MimeUtility.encodeText(file.getOriginalFilename(), "utf-8", "B"), file);
}
}
+
+ if (filePaths != null && filePaths.length > 0) {
+ for (String filePath : filePaths) {
+ if (!StringUtils.isEmpty(filePath)) {
+ DataSource dataSource = new FileDataSource(filePath);
+ messageHelper.addAttachment(MimeUtility.encodeText(
+ FilenameUtils.getBaseName(filePath), "utf-8", "B"), dataSource);
+ }
+ }
+ }
+ this.javaMailSender.send(message);
}
- this.javaMailSender.send(message);
} catch (MailSendException e) {
log.error(e.getMessage());
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 9197d24..6850762 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -1377,15 +1377,17 @@
userMap.put("newUserCount", joinUsers.size());
userMap.put("joinUsers", userVos);
- String[] sendEmails = this.userJoinStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
- List<String> encryptSendEmail = Lists.newArrayList();
+ if (this.userJoinStatisticsEmail != null && !this.userJoinStatisticsEmail.equals("")) {
+ String[] sendEmails = this.userJoinStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
+ List<String> encryptSendEmail = Lists.newArrayList();
- for (String sendEmail : sendEmails) {
- encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ for (String sendEmail : sendEmails) {
+ encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ }
+ // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
+ this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.USER_JOIN_STATISTICS, userMap, null);
}
- // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
- this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.USER_JOIN_STATISTICS, userMap, null);
}
// �쟾泥� �궗�슜�옄, �봽濡쒖젥�듃 �닔, �씠�뒋 �닔瑜� �씠硫붿씪濡� 蹂대궦�떎.
@@ -1403,15 +1405,17 @@
userMap.put("projectCount", CommonUtil.getDecimalFormat(projectCount));
userMap.put("userCount", CommonUtil.getDecimalFormat(activeUsers.size()));
- String[] sendEmails = this.totalStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
- List<String> encryptSendEmail = Lists.newArrayList();
+ if (this.totalStatisticsEmail != null && !this.totalStatisticsEmail.equals("")) {
+ String[] sendEmails = this.totalStatisticsEmail.replaceAll("\\p{Z}", "").split(",");
+ List<String> encryptSendEmail = Lists.newArrayList();
- for (String sendEmail : sendEmails) {
- encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ for (String sendEmail : sendEmails) {
+ encryptSendEmail.add(CommonUtil.encryptAES128(sendEmail));
+ }
+
+ // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
+ this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.TOTAL_STATISTICS, userMap, null);
}
-
- // 寃곗젣 �꽦怨� 硫붿씪 諛쒖넚
- this.systemEmailService.directEmail(encryptSendEmail.toArray(new String[encryptSendEmail.size()]), EmailType.TOTAL_STATISTICS, userMap, null);
}
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 0d13530..148e665 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -284,6 +284,20 @@
</div>
</div>
+ <div class="col-lg-3">
+ <div class="form-group">
+ <label> <span translate="common.registrationDate">�벑濡앹씪</span></label>
+ <input type="text"
+ readonly
+ class="form-control input-sm input-readonly"
+ ng-model="vm.search.registerDateRange"
+ modal-form-auto-scroll
+ date-format="YY-MM-DD"
+ parent-el="'#createdWidget'"
+ date-range-picker>
+ </div>
+ </div>
+
<div class="col-lg-3" ng-repeat="customField in vm.customFields">
<label>{{::customField.name}}</label>
--
Gitblit v1.8.0