From 12a790240ef0301f839a55e1846ed0c5a32dffee Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 13:29:34 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 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 418273c..b83d5e1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -243,15 +243,28 @@
Long delayIssue = 0L; // 吏��뿰�맂 �씠�뒋
Long completeIssue = 0L; // �셿猷뚮맂 �씠�뒋
+ widgetCondition.setLoginUserId(this.webAppUtil.getLoginId());
+ widgetCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ User user = this.webAppUtil.getLoginUserObject();
+
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
-
- remainIssue = this.widgetMapper.countRemainIssue(widgetCondition); // �옍�뿬 �씠�뒋
- delayIssue = this.widgetMapper.countTodayDelayIssue(widgetCondition); // 吏��뿰�맂 �씠�뒋
- assigneeIssue = this.widgetMapper.countAssigneeIssue(widgetCondition); // �븷�떦�맂 �씠�뒋
- registerIssue = this.widgetMapper.countTodayRegisterIssue(widgetCondition); // �벑濡앺븳 �씠�뒋
- noAssigneeIssue = this.widgetMapper.countNoAssigneeIssue(widgetCondition); // 誘명븷�떦 �씠�뒋
- completeIssue = this.widgetMapper.countCompleteIssue(widgetCondition); // �셿猷뚮맂 �씠�뒋
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ remainIssue = this.widgetMapper.countRemainIssue(widgetCondition); // �옍�뿬 �씠�뒋
+ delayIssue = this.widgetMapper.countTodayDelayIssue(widgetCondition); // 吏��뿰�맂 �씠�뒋
+ assigneeIssue = this.widgetMapper.countAssigneeIssue(widgetCondition); // �븷�떦�맂 �씠�뒋
+ registerIssue = this.widgetMapper.countTodayRegisterIssue(widgetCondition); // �벑濡앺븳 �씠�뒋
+ noAssigneeIssue = this.widgetMapper.countNoAssigneeIssue(widgetCondition); // 誘명븷�떦 �씠�뒋
+ completeIssue = this.widgetMapper.countCompleteIssue(widgetCondition); // �셿猷뚮맂 �씠�뒋
+ } else {
+ SetMyDepartmentId(widgetCondition);
+ remainIssue = this.widgetMapper.countRemainIssueByDepartment(widgetCondition); // �옍�뿬 �씠�뒋
+ delayIssue = this.widgetMapper.countTodayDelayIssueByDepartment(widgetCondition); // 吏��뿰�맂 �씠�뒋
+ assigneeIssue = this.widgetMapper.countAssigneeIssueByDepartment(widgetCondition); // �븷�떦�맂 �씠�뒋
+ registerIssue = this.widgetMapper.countTodayRegisterIssueByDepartment(widgetCondition); // �벑濡앺븳 �씠�뒋
+ noAssigneeIssue = this.widgetMapper.countNoAssigneeIssueByDepartment(widgetCondition); // 誘명븷�떦 �씠�뒋
+ completeIssue = this.widgetMapper.countCompleteIssueByDepartment(widgetCondition); // �셿猷뚮맂 �씠�뒋
+ }
}
Map<String, Object> results = new HashMap<>();
@@ -384,7 +397,6 @@
totalCount = this.widgetMapper.countMyAssigneeIssue(widgetCondition);
}
-
// 0.156 - 0.166
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
@@ -481,9 +493,18 @@
// �쐞�젽 寃��깋 議곌굔�쓣 留뚮뱾怨� �쟾泥� �봽濡쒖젥�듃 �젙蹂대�� 由ы꽩�븳�떎.
Map<String, Object> results = this.makeWidgetConditionAllProject(widgetCondition, getWidgetCondition);
+ widgetCondition.setLoginUserId(this.webAppUtil.getLoginId());
+ widgetCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ User user = this.webAppUtil.getLoginUserObject();
+
if (widgetCondition.getProjectId() != null) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
- List<Map<String, Object>> projectMemberIssues = this.widgetMapper.findProjectMemberIssue(widgetCondition);
+ List<Map<String, Object>> projectMemberIssues = Lists.newArrayList();
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ projectMemberIssues = this.widgetMapper.findProjectMemberIssue(widgetCondition);
+ } else {
+ projectMemberIssues = this.widgetMapper.findProjectMemberIssueByDepartment(widgetCondition);
+ }
for (Map<String, Object> projectMemberIssue : projectMemberIssues) {
//String departmentName = MapUtil.getString(projectMemberIssue, "departmentName");
@@ -864,12 +885,22 @@
List<Map<String, Object>> severityIssues = Lists.newArrayList();
Long totalCount = 0L;
+ widgetCondition.setLoginUserId(this.webAppUtil.getLoginId());
+ widgetCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ User user = this.webAppUtil.getLoginUserObject();
+
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
-
- severityCounts = this.widgetMapper.countSeverityIssue(widgetCondition);
- severityIssues = this.widgetMapper.findSeverityIssues(widgetCondition);
- totalCount = this.widgetMapper.countSearchIssue(widgetCondition);
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ severityCounts = this.widgetMapper.countSeverityIssue(widgetCondition);
+ severityIssues = this.widgetMapper.findSeverityIssues(widgetCondition);
+ totalCount = this.widgetMapper.countSearchIssue(widgetCondition);
+ }else {
+ SetMyDepartmentId(widgetCondition);
+ severityCounts = this.widgetMapper.countSeverityIssueByDepartment(widgetCondition);
+ severityIssues = this.widgetMapper.findSeverityIssuesByDepartment(widgetCondition);
+ totalCount = this.widgetMapper.countSearchIssueByDepartment(widgetCondition);
+ }
}
Long criticalIssueCount = 0L, majorIssueCount = 0L, minorIssueCount = 0L, trivialIssueCount = 0L;
@@ -1027,10 +1058,19 @@
// �굹�뿉寃� �븷�떦�맂 �씠�뒋 �젙蹂대�� �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
private ExportExcelVo downloadExcelMyAssigneeIssue() {
WidgetCondition widgetCondition = this.makeWidgetCondition();
+
+ /*widgetCondition.setLoginUserId(this.webAppUtil.getLoginId());
+ widgetCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ User user = this.webAppUtil.getLoginUserObject();*/
+
// �굹�뿉寃� �븷�떦�맂 �씠�뒋
List<Map<String, Object>> assigneeIssues = Lists.newArrayList();
if (widgetCondition.getProjectIds().size() > 0) {
+ //if (this.userWorkspaceService.checkWorkspaceManager(user)) {
assigneeIssues = this.widgetMapper.findMyAssigneeIssue(this.makeWidgetCondition());
+ /*} else {
+ assigneeIssues = this.widgetMapper.findMyAssigneeIssueByDepartment(this.makeWidgetCondition());
+ }*/
}
ExportExcelVo excelInfo = new ExportExcelVo();
--
Gitblit v1.8.0