From f1188ad883af2d5f27744686b91b197bcdb9fd8c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 17 11월 2021 11:15:48 +0900
Subject: [PATCH] 이슈관리 엑셀 다운로드 완료
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 3 ++-
src/main/java/kr/wisestone/owl/util/CommonUtil.java | 17 +++++++++++++++++
src/main/resources/mybatis/query-template/issue-template.xml | 2 +-
3 files changed, 20 insertions(+), 2 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 c6c5436..6190016 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1519,7 +1519,7 @@
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋 �젣紐�
excelInfo.addAttrInfos(new ExportExcelAttrVo("description", this.messageAccessor.message("common.content"), 60, ExportExcelAttrVo.ALIGN_LEFT)); // �궡�슜
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueTypeName", this.messageAccessor.message("common.issueType"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 ���엯
- excelInfo.addAttrInfos(new ExportExcelAttrVo("department", this.messageAccessor.message("common.department"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦遺��꽌
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departments", this.messageAccessor.message("common.department"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦遺��꽌
excelInfo.addAttrInfos(new ExportExcelAttrVo("priorityName", this.messageAccessor.message("common.priority"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �슦�꽑�닚�쐞
excelInfo.addAttrInfos(new ExportExcelAttrVo("severityName", this.messageAccessor.message("common.importance"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // 以묒슂�룄
excelInfo.addAttrInfos(new ExportExcelAttrVo("register", this.messageAccessor.message("common.register"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �벑濡앹옄
@@ -1624,6 +1624,7 @@
result.put("description", description);
result.put("issueTypeName", issueVo.getIssueTypeName());
result.put("assignees", CommonUtil.convertUserVosToString(issueVo.getUserVos()));
+ result.put("departments", CommonUtil.convertDepartmentVosToString(issueVo.getDepartmentVos()));
result.put("priorityName", issueVo.getPriorityName());
result.put("severityName", issueVo.getSeverityName());
diff --git a/src/main/java/kr/wisestone/owl/util/CommonUtil.java b/src/main/java/kr/wisestone/owl/util/CommonUtil.java
index 0fac1dd..fb52889 100644
--- a/src/main/java/kr/wisestone/owl/util/CommonUtil.java
+++ b/src/main/java/kr/wisestone/owl/util/CommonUtil.java
@@ -6,6 +6,7 @@
import com.google.gson.Gson;
import kr.wisestone.owl.domain.enumType.FileType;
import kr.wisestone.owl.type.LikeType;
+import kr.wisestone.owl.vo.DepartmentVo;
import kr.wisestone.owl.vo.UserVo;
import org.apache.commons.codec.binary.*;
import org.apache.commons.codec.binary.Base64;
@@ -690,6 +691,22 @@
return stringBuilder.toString();
}
+ // DepartmentVos �뿉�꽌 遺��꽌 �젙蹂대�� 異붿텧�빐�꽌 臾몄옄�뿴濡� 由ы꽩�빐以��떎. - 二쇰줈 �뿊�� download �뿉�꽌 �궗�슜�맂�떎.
+ public static String convertDepartmentVosToString(List<DepartmentVo> departmentVos) {
+ StringBuilder stringBuilder = new StringBuilder();
+ int count = 0;
+
+ for (DepartmentVo departmentVo : departmentVos) {
+ if (count > 0) {
+ stringBuilder.append("\n");
+ }
+
+ stringBuilder.append(departmentVo.getDepartmentName());
+ count++;
+ }
+ return stringBuilder.toString();
+ }
+
// 寃��깋 �씪�옄瑜� 援ы븳�떎.
public static List<Date> findSearchPeriod(String searchPeriod) {
List<Date> searchDates = Lists.newArrayList();
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 969ffa6..00bff06 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -433,7 +433,7 @@
SELECT
i.id AS issueId,
d.id AS id,
- d.department_name AS name
+ d.department_name AS departmentName
FROM issue i
INNER JOIN issue_department issued ON issued.issue_id = i.id
INNER JOIN department d ON d.id = issued.department_id
--
Gitblit v1.8.0