fix: Dashboard发布任务数统计排除草稿状态,与数据分析页面保持一致
This commit is contained in:
parent
aabcc77ddb
commit
66c6507385
@ -2759,7 +2759,7 @@ public class TaskService {
|
||||
.sum();
|
||||
}
|
||||
|
||||
// 获取当月发布的任务数
|
||||
// 获取当月发布的任务数(排除草稿状态,与数据分析页面保持一致)
|
||||
Long publishedCount = 0L;
|
||||
if (isDeptView && "demand".equals(deptType)) {
|
||||
// 需求部门视角:统计该部门发起的任务数
|
||||
@ -2767,6 +2767,7 @@ public class TaskService {
|
||||
.in(Task::getPublisherDeptId, deptAndChildIds)
|
||||
.ge(Task::getCreateTime, monthStart)
|
||||
.le(Task::getCreateTime, monthEnd)
|
||||
.ne(Task::getStatus, "draft") // 排除草稿
|
||||
.eq(Task::getDeleted, 0));
|
||||
} else if (isDeptView && "receiving".equals(deptType)) {
|
||||
// 接单部门视角:统计该部门接单的任务数
|
||||
@ -2774,13 +2775,15 @@ public class TaskService {
|
||||
.in(Task::getReceiverDeptId, deptAndChildIds)
|
||||
.ge(Task::getCreateTime, monthStart)
|
||||
.le(Task::getCreateTime, monthEnd)
|
||||
.ne(Task::getStatus, "draft") // 排除草稿
|
||||
.eq(Task::getDeleted, 0));
|
||||
} else {
|
||||
// 当前用户发布的任务数
|
||||
publishedCount = taskMapper.selectCount(new LambdaQueryWrapper<Task>()
|
||||
.eq(Task::getPublisherId, userId)
|
||||
.ge(Task::getCreateTime, monthStart)
|
||||
.le(Task::getCreateTime, monthEnd)
|
||||
.eq(Task::getPublisherId, userId)
|
||||
.ge(Task::getCreateTime, monthStart)
|
||||
.le(Task::getCreateTime, monthEnd)
|
||||
.ne(Task::getStatus, "draft") // 排除草稿
|
||||
.eq(Task::getDeleted, 0));
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user