From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:25:23 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 82 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 16 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..3a7cdc3 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); // �씪諛� �쑀���뒗 誘명븷�떦 �씠�뒋 0媛쒕줈 蹂댁씠寃�
+ 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");
@@ -761,10 +782,15 @@
}
List<Map<String, Object>> results = Lists.newArrayList();
+ User user = this.webAppUtil.getLoginUserObject();
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
- results = this.widgetMapper.findByStandIssueStatus(widgetCondition);
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ results = this.widgetMapper.findByStandIssueStatus(widgetCondition);
+ }else {
+ results = this.widgetMapper.findByStandIssueStatusOfDepartment(widgetCondition);
+ }
}
for (Map<String, Object> result : results) {
@@ -788,10 +814,15 @@
public void findByStandIssueType(Map<String, Object> resJsonData, WidgetCondition widgetCondition, Boolean getWidgetCondition) {
// �쐞�젽 寃��깋 議곌굔�쓣 �뼸�뼱�빞 �븷 �긽�솴�씪 �븣 - �솕硫댁뿉�꽌 �꺆�쓣 �닃�윭 �뜲�씠�꽣瑜� �옱�슂泥��뻽�쓣 �븣 �쐞�젽 寃��깋 議곌굔�쓣 留뚮뱾怨� �쟾泥� �봽濡쒖젥�듃 �젙蹂대�� 由ы꽩�븳�떎.
Map<String, Object> results = this.makeWidgetConditionAllProject(widgetCondition, getWidgetCondition);
-
+ User user = this.webAppUtil.getLoginUserObject();
if (widgetCondition.getProjectId() != null) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
- List<Map<String, Object>> issueTypeIssues = this.widgetMapper.findByStandIssueType(widgetCondition);
+ List<Map<String, Object>> issueTypeIssues = Lists.newArrayList();
+ if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ issueTypeIssues = this.widgetMapper.findByStandIssueType(widgetCondition);
+ } else {
+ issueTypeIssues = this.widgetMapper.findByStandIssueTypeOfDepartment(widgetCondition);
+ }
// �씠�뒋 �젙蹂�
results.put("issues", issueTypeIssues);
} else {
@@ -864,12 +895,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 +1068,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