From 92a93bce6b7ee6477849ca0cfd171915c2b05c7f Mon Sep 17 00:00:00 2001 From: "yang.yongquan" <3395816735@qq.com> Date: Thu, 22 Dec 2022 19:37:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaskServiceImpl.java | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java index ca3f633..b568ea4 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java @@ -71,6 +71,7 @@ public class TaskServiceImpl extends ServiceImpl implements IT } try { List res = new ArrayList<>(); + // 添加根任务点Id，获得子节点数目 res.add(taskId); Task task = baseMapper.selectOne(Wrappers.lambdaQuery().eq(Task::getTaskId, taskId)); Task fatherTask = baseMapper.selectOne(Wrappers.lambdaQuery().eq(Task::getTaskId, task.getTaskFatherId())); @@ -79,14 +80,18 @@ public class TaskServiceImpl extends ServiceImpl implements IT if (baseMapper.update(fatherTask, Wrappers.lambdaQuery().eq(Task::getTaskId, fatherTask.getTaskId())) != 1) { throw new BadRequestException("删除失败"); } - while (true) { + // 每次按照广度优先搜索的方式，按照树形的任务结构向下层寻找 + for(int depth = 1; depth <= 20; depth++) { + // 寻找下一层的所有任务 List list = baseMapper.selectList( Wrappers.lambdaQuery() .in(Task::getTaskFatherId, res)); + // 删除这一层的所有任务 baseMapper.update(null, Wrappers.lambdaUpdate().in(Task::getTaskId, res).set(Task::getChildrenCount, 0)); baseMapper.delete(Wrappers.lambdaQuery().in(Task::getTaskId, res)); - + // 该层为空 if (list == null || list.isEmpty()) break; + // 获得下一层的任务id res = list.stream().map(Task::getTaskId).collect(Collectors.toList()); } return true; @@ -108,14 +113,17 @@ public class TaskServiceImpl extends ServiceImpl implements IT } try { List res = new ArrayList<>(); + // 获得初始的任务Id res.add(taskId); - while (true) { + for(int depth = 1; depth <= 20; depth++) { + // 获得下一层所有任务 List list = baseMapper.selectList( Wrappers.lambdaQuery() .in(Task::getTaskFatherId, res) .ne(Task::getTaskStatus, Task.STATUS_COMPLETED) .ne(Task::getTaskStatus, Task.STATUS_CLOSED) ); + // 修改该层任务，为关闭状态 baseMapper.update( null, Wrappers.lambdaUpdate() @@ -124,6 +132,7 @@ public class TaskServiceImpl extends ServiceImpl implements IT .set(Task::getTaskClosedTime, LocalDateTime.now()) ); if (list == null || list.isEmpty()) break; + // 获得下一层的任务Id res = list.stream().map(Task::getTaskId).collect(Collectors.toList()); } return true; @@ -358,17 +367,22 @@ public class TaskServiceImpl extends ServiceImpl implements IT return task; } + // 完成任务数目概况统计 @Override public Map> getProjectTaskTrend(String token, Integer projectId) throws ForbiddenException { if (projectGroupService.getProjectAccessLevel(token, projectId) == 0) { throw new ForbiddenException(ForbiddenException.UNABLE_TO_OPERATE); } + // 起止日期 LocalDate endDate = LocalDate.now(); LocalDate startDate = endDate.plusDays(-14); + // 返回结果 Map> res = new HashMap<>(); + // 获得开始时间之前的所有任务的数据 List resList = getResultTaskStatus(projectId, startDate); + // 分别获得该项目在起止时间之间所有未关闭的和关闭的任务任务 TaskTrendDTO lastTaskTrend = new TaskTrendDTO(); lastTaskTrend.setTaskDate(endDate.plusDays(1)); List unclosedList = baseMapper.selectTaskUnclosedNum(projectId, startDate, endDate); @@ -376,6 +390,7 @@ public class TaskServiceImpl extends ServiceImpl implements IT List closedList = baseMapper.selectTaskClosedNum(projectId, startDate, endDate); closedList.add(lastTaskTrend); + // 各个状态分别进行统计 for (TaskTrendDTO iterTask : resList) { List taskList = new ArrayList<>(); ListIterator closedIter = closedList.listIterator(); @@ -383,9 +398,11 @@ public class TaskServiceImpl extends ServiceImpl implements IT TaskTrendDTO closedTaskTrend = null; TaskTrendDTO unclosedTaskTrend = null; + // 关闭与未关闭的任务的中间累加对象 closedTaskTrend = closedIter.next(); unclosedTaskTrend = unclosedIter.next(); + //按照时间顺序进行统计 Long lastNum = iterTask.getTaskNum(); LocalDate iterDate = startDate; while (!iterDate.isAfter(endDate)) { @@ -393,29 +410,26 @@ public class TaskServiceImpl extends ServiceImpl implements IT taskTrend.setTaskDate(iterDate); taskTrend.setTaskStatus(iterTask.getTaskStatus()); taskTrend.setTaskNum(lastNum); - while (true) { - if (iterDate.isBefore(unclosedTaskTrend.getTaskDate())) { - break; - } + // 将之前日期之前的所有统计数据叠加 + while (iterDate.isBefore(unclosedTaskTrend.getTaskDate())) { taskTrend.changeForUnclosed(unclosedTaskTrend); if (unclosedIter.hasNext()) { unclosedTaskTrend = unclosedIter.next(); } } - while (true) { - if (iterDate.isBefore(closedTaskTrend.getTaskDate())) { - break; - } + while (iterDate.isBefore(closedTaskTrend.getTaskDate())) { taskTrend.changeForClosed(closedTaskTrend); if (closedIter.hasNext()) { closedTaskTrend = closedIter.next(); } } + // 将统计数据放入返回值时 taskList.add(taskTrend); iterDate = iterDate.plusDays(1); lastNum = taskTrend.getTaskNum(); // System.out.println(taskTrend.toString()); } + // 各个状态返回 res.put(iterTask.getTaskStatus(), taskList); } return res;