fix: 接单部门Dashboard已完成任务只统计子任务(与列表显示一致)

This commit is contained in:
Your Name 2026-01-17 09:45:57 +08:00
parent 5221f7a799
commit 6fb03d14b9

View File

@ -2614,17 +2614,11 @@ public class TaskService {
// 已完成的任务数
Long completedCount = 0L;
if (isDeptView && "receiving".equals(deptType)) {
// 接单部门视角:统计主任务+子任务
Long mainCompleted = taskMapper.selectCount(new LambdaQueryWrapper<Task>()
.eq(Task::getStatus, "completed")
.in(Task::getReceiverDeptId, deptAndChildIds)
.eq(Task::getDeleted, 0));
Long subCompleted = taskItemMapper.selectCount(new LambdaQueryWrapper<TaskItem>()
// 接单部门视角:只统计子任务(与列表显示一致)
completedCount = taskItemMapper.selectCount(new LambdaQueryWrapper<TaskItem>()
.eq(TaskItem::getStatus, "completed")
.in(TaskItem::getReceiverDeptId, deptAndChildIds));
completedCount = mainCompleted + subCompleted;
log.info("接单部门已完成任务统计: mainCompleted={}, subCompleted={}, total={}",
mainCompleted, subCompleted, completedCount);
log.info("接单部门已完成任务统计(子任务): completedCount={}", completedCount);
} else if (isDeptView && "demand".equals(deptType)) {
completedCount = taskMapper.selectCount(new LambdaQueryWrapper<Task>()
.eq(Task::getStatus, "completed")