From 41c8f3c976c0d8ec4b0a6ad3d7f4ce90a9de03c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 21:19:22 +0900
Subject: [PATCH] 프로젝트 담당부서 수정
---
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
index 799ed53..6e82dd0 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -512,9 +512,11 @@
widgetCondition.setPage(pageable.getPageNumber() * pageable.getPageSize());
widgetCondition.setPageSize(pageable.getPageSize());
- Map<String, Object> countChangeStatusAndAssigneeIssue = new HashMap<>();
- countChangeStatusAndAssigneeIssue.put("changeAssigneeCount", 0L);
- countChangeStatusAndAssigneeIssue.put("changeIssueStatusCount", 0L);
+ //Map<String, Object> countChangeStatusAndAssigneeIssue = new HashMap<>();
+ //countChangeStatusAndAssigneeIssue.put("changeAssigneeCount", 0L);
+ Map<String, Object> countChangeStatusAndDepartmentIssue = new HashMap<>();
+ countChangeStatusAndDepartmentIssue.put("changeDepartmentCount", 0L);
+ countChangeStatusAndDepartmentIssue.put("changeIssueStatusCount", 0L);
// 0.212 - 0.213
List<Map<String, Object>> riskIssues = Lists.newArrayList();
// 0.244 - 0.248
@@ -522,7 +524,8 @@
Long totalCount = 0L;
if (widgetCondition.getProjectIds().size() > 0) {
- countChangeStatusAndAssigneeIssue = this.widgetMapper.countChangeStatusAndAssigneeIssue(widgetCondition);
+ //countChangeStatusAndAssigneeIssue = this.widgetMapper.countChangeStatusAndAssigneeIssue(widgetCondition);
+ countChangeStatusAndDepartmentIssue = this.widgetMapper.countChangeStatusAndDepartmentIssue(widgetCondition);
riskIssues = this.widgetMapper.findRiskIssue(widgetCondition);
totalCount = this.widgetMapper.countRiskIssue(widgetCondition);
}
@@ -535,8 +538,9 @@
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
Map<String, Object> results = new HashMap<>();
- results.put("changeAssigneeCount", MapUtil.getLong(countChangeStatusAndAssigneeIssue, "changeAssigneeCount"));
- results.put("changeIssueStatusCount", MapUtil.getLong(countChangeStatusAndAssigneeIssue, "changeIssueStatusCount"));
+ //results.put("changeAssigneeCount", MapUtil.getLong(countChangeStatusAndAssigneeIssue, "changeAssigneeCount"));
+ results.put("changeDepartmentCount", MapUtil.getLong(countChangeStatusAndDepartmentIssue, "changeDepartmentCount"));
+ results.put("changeIssueStatusCount", MapUtil.getLong(countChangeStatusAndDepartmentIssue, "changeIssueStatusCount"));
results.put("issues", riskIssues);
results.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
--
Gitblit v1.8.0