From 45ae96886e71ba5f9b7865461b890f2e0e2a9f41 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 09:07:11 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 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 3fb4c81..3a1202a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -370,7 +370,6 @@
         projectRoleUserMap.put("statuses", Lists.newArrayList("02"));   //  愿�由ъ옄 議고쉶
         //  愿�由ъ옄 �젙蹂� �뀑�똿
         List<Map<String, Object>> projectRoleUsers = this.projectRoleUserService.findProjectRoleUser(projectRoleUserMap);
-
         if (projectRoleUsers != null && !projectRoleUsers.isEmpty()) {
             for (Map<String, Object> projectRoleUser : projectRoleUsers) {
                 UserVo userVo = ConvertUtil.convertMapToClass(projectRoleUser, UserVo.class);
@@ -404,7 +403,7 @@
             departsBuilder.append(issueDepartment.getDepartment().getDepartmentName());
             departsBuilder.append("\n");
         }
-        issueMap.put("departsBuilder", departsBuilder.toString());
+        issueMap.put("departments", departsBuilder.toString());
 
         //  湲곌컙
         if (!StringUtils.isEmpty(issue.getStartDate())) {
@@ -555,6 +554,8 @@
         //  Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
         this.setMapToIssueVo(results, issueVos, issueCondition);
 
+        this.setCountDownIssues(results, issueVos);
+
         resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
         resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
                 totalPage, totalCount));
@@ -562,6 +563,27 @@
         //  �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
         log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_FIND));
         return issueVos;
+    }
+
+    private void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
+        for (Map<String, Object> result : results){
+            List<Issue> downIssues = this.issueRepository.findByParentIssueId((Long) result.get("id")); //�븯�쐞�씠�뒋 媛��졇�삤湲�
+            if(downIssues != null && downIssues.size() > 0){ //�긽�쐞�씠�뒋 媛�吏�怨� �엳�뒗 �븷�뱾�씠 �엳�쑝硫�
+                for(Issue downIssue : downIssues){
+                    Long parentIssueId = downIssue.getParentIssue().getId();
+                    int downIssueCount = 1;
+                    Issue parentIssue = this.getIssue(parentIssueId);
+                    IssueVo parentIssueVo = ConvertUtil.copyProperties(parentIssue, IssueVo.class);
+                    parentIssueVo.setDownIssueCount(downIssueCount);
+
+                    for(IssueVo issueVo : issueVos){
+                        if(issueVo.getId().equals(parentIssueVo.getId())){
+                            issueVo.setDownIssueCount(parentIssueVo.getDownIssueCount());
+                        }
+                    }
+                }
+            }
+        }
     }
 
 
@@ -1943,15 +1965,11 @@
                         result.put("customField_" + issueCustomFieldValueVo.getCustomFieldVo().getId().toString(), useValue + ", " + issueCustomFieldValueVo.getUseValue());
                     }
                 }
-
-                //�뾽泥�, ISP, �샇�뒪�똿 異붽�
-
                 results.add(result);
             } catch (Exception e) {
                 log.error("�뿊�� �떎�슫濡쒕뱶 �삤瑜� 諛쒖깮");
             }
         }
-
         return results;
     }
 
@@ -2925,4 +2943,4 @@
             resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
         }
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0