From 6211b73ad7750a62652bacf5bcf05002c62fb907 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 15:57:16 +0900
Subject: [PATCH] - 이슈 상세페이지 연관,하위 이슈 페이징 처리 완료
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 7be00d2..1ec2a43 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1472,17 +1472,22 @@
// �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
- public void detailIssue(Map<String, Object> resJsonData, IssueCondition issueCondition, Pageable relPageable, Pageable downPageable) {
+ public void detailIssue(Map<String, Object> resJsonData, IssueCondition issueCondition) {
IssueVo issueVo = new IssueVo();
+ Pageable relPageable = issueCondition.getRelPageable();
+ Pageable downPageable = issueCondition.getDownPageable();
if (issueCondition.getId() != null) {
Issue issue = this.getIssue(issueCondition.getId());
issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
User user = this.webAppUtil.getLoginUserObject();
- issueVo.setRelPage(relPageable.getPageNumber() * relPageable.getPageSize());
- issueVo.setRelPageSize(relPageable.getPageSize());
+ issueVo.setRelPageNumber(relPageable.getPageNumber());
+ issueVo.setRelPageSize(relPageable.getPageSize());
+ issueVo.setRelPage(relPageable.getPageNumber() * relPageable.getPageSize());
+
+ issueVo.setDownPageNumber(downPageable.getPageNumber());
issueVo.setDownPage(downPageable.getPageNumber() * downPageable.getPageSize());
issueVo.setDownPageSize(downPageable.getPageSize());
@@ -1510,19 +1515,10 @@
break;
}
}
- Long relTotalCount = issueVo.getRelTotalCount();
- int relTotalPage = issueVo.getRelTotalPage();
-
- Long downTotalCount = issueVo.getDownTotalCount();
- int downTotalPage = issueVo.getDownTotalPage();
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_DETAIL));
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVo);
- resJsonData.put(Constants.REQ_KEY_RELATION_ISSUE_PAGE_VO, new ResPage(relPageable.getPageNumber(), relPageable.getPageSize(),
- relTotalPage, relTotalCount));
- resJsonData.put(Constants.REQ_KEY_DOWN_ISSUE_PAGE_VO, new ResPage(downPageable.getPageNumber(), downPageable.getPageSize(),
- downTotalPage, downTotalCount));
}
// �뀒�씠釉� �꽕�젙 �뀑�똿
--
Gitblit v1.8.0