From dea4bb128425e06684bf95e8e97613a20cf3bcfa Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 24 1월 2022 18:10:31 +0900
Subject: [PATCH] 이슈 테이블 표시 설정 10 이상 정렬 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index 16c21d2..ef07f67 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -121,8 +121,10 @@
project.setProjectKey("BTS");
project.setStatus(Project.PROJECT_OPEN);
project.setDescription(this.messageAccessor.message("common.intoTheSystemIssueManagementProject")); // �떆�뒪�뀥�뿉�꽌 湲곕낯�쑝濡� �젣怨듬릺�뒗 �씠�뒋 愿�由� �봽濡쒖젥�듃�엯�땲�떎.
- project.setStartDate(DateUtil.convertDateToYYYYMMDD(new Date()));
- project.setEndDate(DateUtil.convertDateToYYYYMMDD(DateUtil.addDays(new Date(), 3650)));
+ //project.setStartDate(DateUtil.convertDateToYYYYMMDD(new Date()));
+ //project.setEndDate(DateUtil.convertDateToYYYYMMDD(DateUtil.addDays(new Date(), 3650)));
+ project.setStartDate("");//null�몴�떆 諛⑹�
+ project.setEndDate("");
// 湲곕낯�쑝濡� �깮�꽦�릺�뒗 �봽濡쒖젥�듃�쓽 �쑀�삎�� BTS
project.setProjectType(ProjectType.BTS_PROJECT);
project.setWorkspace(workspace);
@@ -389,6 +391,7 @@
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
// �봽濡쒖젥�듃 議고쉶 寃곌낵瑜� ProjectVos 濡� 蹂��솚�븳�떎. - 愿�由ъ옄, �씪諛� �궗�슜�옄 �젙蹂� 異붽�
List<ProjectVo> projectVos = this.makeProjectVos(results, user);
+ this.setParentProject(projectVos);
this.setChildrenProject(projectVos, user);
resJsonData.put(Constants.RES_KEY_CONTENTS, projectVos);
@@ -396,6 +399,13 @@
totalPage, totalCount));
return projectVos;
+ }
+
+ // �씠�뒋�쑀�삎�뿉 �냽�븳 �봽濡쒖젥�듃 紐⑸줉�쓣 議고쉶�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public void findIssueType(Map<String, Object> resJsonData, ProjectCondition condition) {
+ resJsonData.put(Constants.RES_KEY_CONTENTS, this.projectMapper.findByIssueType(condition));
}
void setChildrenProject(List<ProjectVo> projectVos, User user) {
@@ -449,6 +459,20 @@
}
return projectVos;
+ }
+
+ // �긽�쐞 �봽濡쒖젥�듃瑜� 李얠븘以��떎.
+ private void setParentProject(List<ProjectVo> projectVos) {
+ for (ProjectVo projectVo : projectVos) {
+ ProjectClosure projectClosure = this.projectClosureRepository.findByProjectId(projectVo.getId());
+ if (projectClosure != null) {
+ Project parentProject = this.getProject(projectClosure.getParentProject().getId());
+ ProjectVo parentProjectVo = ConvertUtil.copyProperties(parentProject, ProjectVo.class);
+ parentProjectVo.setParentYn(true);
+ ConvertUtil.copyProperties(parentProjectVo, projectVo);
+ this.setProjectDepartment(projectVo);
+ }
+ }
}
// 愿�由ъ옄, �씪諛� �궗�슜�옄瑜� 議곌굔�뿉 �뵲�씪 李얠븘以��떎.
@@ -1293,4 +1317,4 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, ConvertUtil.copyProperties(project, ProjectVo.class));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0