From eee313007ce5c4f0879d764d56d3a1ba93f6fb37 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 16:33:49 +0900
Subject: [PATCH] 대시보드 - 멤버별 진행률 완료 및 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 95 insertions(+), 9 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..df9aac1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -7,15 +7,18 @@
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.IssueStatus;
import kr.wisestone.owl.domain.Project;
+import kr.wisestone.owl.domain.ProjectClosure;
+import kr.wisestone.owl.domain.UserDepartment;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IssueMapper;
import kr.wisestone.owl.mapper.WidgetMapper;
+import kr.wisestone.owl.repository.ProjectClosureRepository;
+import kr.wisestone.owl.repository.UserDepartmentRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.IssueCondition;
-import kr.wisestone.owl.web.condition.ProjectCondition;
import kr.wisestone.owl.web.condition.WidgetCondition;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.lang3.StringUtils;
@@ -53,10 +56,19 @@
private ProjectService projectService;
@Autowired
+ private ProjectClosureService projectClosureService;
+
+ @Autowired
private IssueStatusService issueStatusService;
@Autowired
private UserService userService;
+
+ @Autowired
+ private UserDepartmentService userDepartmentService;
+
+ @Autowired
+ private UserDepartmentRepository userDepartmentRepository;
@Autowired
protected MessageAccessor messageAccessor;
@@ -72,6 +84,9 @@
@Autowired
private UserWorkspaceService userWorkspaceService;
+
+ @Autowired
+ private ProjectClosureRepository projectClosureRepository;
// �쟾泥� �쐞�젽�쓣 議고쉶�븳�떎.
@@ -173,10 +188,50 @@
widgetCondition.setProjectIds(projectIds);
widgetCondition.setProjects(projects);
widgetCondition.setLoginUserId(this.webAppUtil.getLoginId());
+ this.SetMyDepartmentId(widgetCondition); // 濡쒓렇�씤 �븳 �쑀��媛� �냽�빐�엳�뒗 遺��꽌
widgetCondition.setCompleteDate(DateUtil.convertDateToStr(new Date()));
widgetCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
return widgetCondition;
+ }
+
+ void SetMyDepartmentId(WidgetCondition widgetCondition){
+ Long loginId = widgetCondition.getLoginUserId();
+ List<Long> myDepartmentIds = Lists.newArrayList();
+ List<UserDepartment> myDepartments = this.userDepartmentRepository.findByUserId(loginId);
+
+ if(myDepartments != null && myDepartments.size() > 0){
+ for(UserDepartment myDepartment : myDepartments){
+ myDepartmentIds.add(myDepartment.getDepartmentId());
+ }
+ }
+ widgetCondition.setMyDepartmentIds(myDepartmentIds);
+ }
+
+ void SetMeAndDownProjectIds(List<Long> parentProjectIds, WidgetCondition widgetCondition) {
+ List<Long> downProjectIds = Lists.newArrayList();
+ if(parentProjectIds != null && parentProjectIds.size() > 0){
+ for(Long parentProjectId : parentProjectIds){
+ List<ProjectClosure> projectClosures = this.projectClosureRepository.findByParentProjectId(parentProjectId); //�궡 �봽濡쒖젥�듃ID媛� �긽�쐞�봽濡쒖젥�듃�씤寃� �엳�뒗吏�
+ if(projectClosures != null && projectClosures.size() > 0){
+ for(ProjectClosure projectClosure : projectClosures){
+ if(projectClosure.getParentProject().getId().equals(parentProjectId)){
+ downProjectIds.add(projectClosure.getProject().getId());
+ //widgetCondition.setDownProjectIds(downProjectIds);
+ }else{
+ downProjectIds.clear();
+ }
+ }
+ }else{
+ downProjectIds.clear();
+ }
+ widgetCondition.setDownProjectIds(downProjectIds);
+ List<Long> meAndDownProjectIds = Lists.newArrayList();
+ meAndDownProjectIds.addAll(widgetCondition.getProjectIds());
+ meAndDownProjectIds.addAll(widgetCondition.getDownProjectIds());
+ widgetCondition.setMeAndDownProjectIds(meAndDownProjectIds);
+ }
+ }
}
// �쟾泥� �씠�뒋 �젙蹂대�� 議고쉶�븳�떎.
@@ -191,6 +246,8 @@
Long completeIssue = 0L; // �셿猷뚮맂 �씠�뒋
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
+
remainIssue = this.widgetMapper.countRemainIssue(widgetCondition); // �옍�뿬 �씠�뒋
delayIssue = this.widgetMapper.countTodayDelayIssue(widgetCondition); // 吏��뿰�맂 �씠�뒋
assigneeIssue = this.widgetMapper.countAssigneeIssue(widgetCondition); // �븷�떦�맂 �씠�뒋
@@ -221,6 +278,7 @@
List<Map<String, Object>> progressingProjectDetails = Lists.newArrayList();
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager()) {
progressingProjectDetails = this.widgetMapper.findProjectProgressAll(widgetCondition);
} else {
@@ -320,6 +378,7 @@
Long totalCount = 0L;
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
todayCount = this.widgetMapper.countTodayMyAssigneeIssue(widgetCondition);
assigneeIssues = this.widgetMapper.findMyAssigneeIssue(widgetCondition);
totalCount = this.widgetMapper.countMyAssigneeIssue(widgetCondition);
@@ -350,6 +409,8 @@
Long totalCount = 0L;
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
+
delayIssues = this.widgetMapper.findDelayIssue(widgetCondition);
totalCount = this.widgetMapper.countDelayIssue(widgetCondition);
}
@@ -396,6 +457,7 @@
Long totalCount = 0L;
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
todayCount = this.widgetMapper.countTodayRegisterIssue(widgetCondition);
registerIssues = this.widgetMapper.findRegisterIssue(widgetCondition);
totalCount = this.widgetMapper.countRegisterIssue(widgetCondition);
@@ -420,12 +482,14 @@
Map<String, Object> results = this.makeWidgetConditionAllProject(widgetCondition, getWidgetCondition);
if (widgetCondition.getProjectId() != null) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
List<Map<String, Object>> projectMemberIssues = this.widgetMapper.findProjectMemberIssue(widgetCondition);
for (Map<String, Object> projectMemberIssue : projectMemberIssues) {
+ //String departmentName = MapUtil.getString(projectMemberIssue, "departmentName");
Long completeCount = MapUtil.getLong(projectMemberIssue, "completeCount");
Long remainCount = MapUtil.getLong(projectMemberIssue, "remainCount");
- projectMemberIssue.put("account", CommonUtil.decryptAES128(MapUtil.getString(projectMemberIssue, "account")));
+ //projectMemberIssue.put("account", CommonUtil.decryptAES128(MapUtil.getString(projectMemberIssue, "account")));
// �봽濡쒖젥�듃 吏꾪뻾瑜� �젙蹂대�� 援ы븳�떎.
this.statisticsProject(completeCount, remainCount, projectMemberIssue, "projectProgressPercent");
@@ -449,6 +513,8 @@
List<Map<String, Object>> assigneeRemainIssueMaps = Lists.newArrayList();
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
+
registerCompleteIssueMaps = this.widgetMapper.findMyRegisterCompleteIssue(widgetCondition);
registerRemainIssueMaps = this.widgetMapper.findMyRegisterRemainIssue(widgetCondition);
assigneeCompleteIssueMaps = this.widgetMapper.findMyAssigneeCompleteIssue(widgetCondition);
@@ -512,9 +578,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 +590,9 @@
Long totalCount = 0L;
if (widgetCondition.getProjectIds().size() > 0) {
- countChangeStatusAndAssigneeIssue = this.widgetMapper.countChangeStatusAndAssigneeIssue(widgetCondition);
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
+ //countChangeStatusAndAssigneeIssue = this.widgetMapper.countChangeStatusAndAssigneeIssue(widgetCondition);
+ countChangeStatusAndDepartmentIssue = this.widgetMapper.countChangeStatusAndDepartmentIssue(widgetCondition);
riskIssues = this.widgetMapper.findRiskIssue(widgetCondition);
totalCount = this.widgetMapper.countRiskIssue(widgetCondition);
}
@@ -535,8 +605,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));
@@ -610,6 +681,8 @@
Long totalIssueCount = 0L;
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
+
dateCounts = this.widgetMapper.findIssueComplete(widgetCondition);
totalIssueCount = this.widgetMapper.countTotalIssue(widgetCondition);
}
@@ -690,6 +763,7 @@
List<Map<String, Object>> results = Lists.newArrayList();
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
results = this.widgetMapper.findByStandIssueStatus(widgetCondition);
}
@@ -716,6 +790,7 @@
Map<String, Object> results = this.makeWidgetConditionAllProject(widgetCondition, getWidgetCondition);
if (widgetCondition.getProjectId() != null) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
List<Map<String, Object>> issueTypeIssues = this.widgetMapper.findByStandIssueType(widgetCondition);
// �씠�뒋 �젙蹂�
results.put("issues", issueTypeIssues);
@@ -790,6 +865,8 @@
Long totalCount = 0L;
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
+
severityCounts = this.widgetMapper.countSeverityIssue(widgetCondition);
severityIssues = this.widgetMapper.findSeverityIssues(widgetCondition);
totalCount = this.widgetMapper.countSearchIssue(widgetCondition);
@@ -961,6 +1038,7 @@
excelInfo.setDatas(assigneeIssues);
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueKey", this.messageAccessor.message("common.issueKey"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 踰덊샇
excelInfo.addAttrInfos(new ExportExcelAttrVo("registerDate", this.messageAccessor.message("common.registerDate"), 8, ExportExcelAttrVo.ALIGN_CENTER)); // �벑濡앹씪
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("projectName", this.messageAccessor.message("common.project"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �봽濡쒖젥�듃
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueStatusName", this.messageAccessor.message("common.status"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �긽�깭
excelInfo.addAttrInfos(new ExportExcelAttrVo("completeDate", this.messageAccessor.message("common.endDate"), 15, ExportExcelAttrVo.ALIGN_CENTER)); // 醫낅즺�씪
@@ -1028,6 +1106,7 @@
excelInfo.setDatas(riskIssues);
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueKey", this.messageAccessor.message("common.issueKey"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 踰덊샇
excelInfo.addAttrInfos(new ExportExcelAttrVo("riskType", this.messageAccessor.message("common.division"), 15, ExportExcelAttrVo.ALIGN_CENTER)); // 援щ텇
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("projectName", this.messageAccessor.message("common.project"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �봽濡쒖젥�듃
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueStatusName", this.messageAccessor.message("common.status"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �긽�깭
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueUsers", this.messageAccessor.message("common.assignee"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦�옄
@@ -1049,6 +1128,7 @@
// �궡媛� �벑濡앺븳 �씠�뒋
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
registerIssues = this.widgetMapper.findRegisterIssue(widgetCondition);
}
@@ -1060,6 +1140,7 @@
excelInfo.setDatas(registerIssues);
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueKey", this.messageAccessor.message("common.issueKey"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 踰덊샇
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueStatusName", this.messageAccessor.message("common.status"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �긽�깭
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("projectName", this.messageAccessor.message("common.project"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �봽濡쒖젥�듃
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋
excelInfo.addAttrInfos(new ExportExcelAttrVo("period", this.messageAccessor.message("common.period"), 15, ExportExcelAttrVo.ALIGN_CENTER)); // 湲곌컙
return excelInfo;
@@ -1090,6 +1171,7 @@
widgetCondition.setPageSize(totalCount.intValue());
if (widgetCondition.getProjectIds().size() > 0) {
+ SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
delayIssues = this.widgetMapper.findDelayIssue(widgetCondition);
}
@@ -1104,6 +1186,7 @@
excelInfo.setDatas(delayIssues);
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueKey", this.messageAccessor.message("common.issueKey"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 踰덊샇
excelInfo.addAttrInfos(new ExportExcelAttrVo("delayDay", this.messageAccessor.message("common.delayDate"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 吏��뿰�씪
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("projectName", this.messageAccessor.message("common.project"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �봽濡쒖젥�듃
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueStatusName", this.messageAccessor.message("common.status"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �긽�깭
excelInfo.addAttrInfos(new ExportExcelAttrVo("period", this.messageAccessor.message("common.period"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 湲곌컙
@@ -1145,7 +1228,9 @@
excelInfo.setFileName(this.messageAccessor.message("common.progressByMember")); // 硫ㅻ쾭蹂� 吏꾪뻾瑜�
excelInfo.setDatas(members);
- excelInfo.addAttrInfos(new ExportExcelAttrVo("byName", this.messageAccessor.message("common.teamMember"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // ���썝
+ //excelInfo.addAttrInfos(new ExportExcelAttrVo("byName", this.messageAccessor.message("common.teamMember"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // ���썝
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("projectName", this.messageAccessor.message("common.project"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �봽濡쒖젥�듃
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("common.teamDepartment"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �떞�떦遺��꽌
excelInfo.addAttrInfos(new ExportExcelAttrVo("projectProgressPercent", this.messageAccessor.message("common.progressPercent"), 6, ExportExcelAttrVo.ALIGN_LEFT)); // 吏꾪뻾瑜�
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueCount", this.messageAccessor.message("common.assignedIssue"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦 �씠�뒋
excelInfo.addAttrInfos(new ExportExcelAttrVo("delayCount", this.messageAccessor.message("common.delaying"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // 吏��뿰以�
@@ -1222,6 +1307,7 @@
excelInfo.setDatas(severityIssue);
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueKey", this.messageAccessor.message("common.issueKey"), 8, ExportExcelAttrVo.ALIGN_CENTER)); //�씠�뒋 踰덊샇
excelInfo.addAttrInfos(new ExportExcelAttrVo("severityName", this.messageAccessor.message("common.importance"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // 以묒슂�룄
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("projectName", this.messageAccessor.message("common.project"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �봽濡쒖젥�듃
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋�젣紐�
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueStatusName", this.messageAccessor.message("common.status"), 6, ExportExcelAttrVo.ALIGN_CENTER)); //�씠�뒋 �긽�깭
excelInfo.addAttrInfos(new ExportExcelAttrVo("period", this.messageAccessor.message("common.period"), 15, ExportExcelAttrVo.ALIGN_CENTER)); // 湲곌컙
--
Gitblit v1.8.0