更改了Task的getHolderLevel的逻辑
parent
bc20a0212b
commit
16200365d9
|
@ -32,6 +32,7 @@ public interface ITaskService extends IService<Task> {
|
||||||
Integer getHolderLevel(Integer staffId, Integer staffGlobalLevel, Long taskId);
|
Integer getHolderLevel(Integer staffId, Integer staffGlobalLevel, Long taskId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* 对拥有项目一级/二级访问权限的员工,直接返回1
|
||||||
* @return 1:all rights 2:father holder 3:current holder 0:no right
|
* @return 1:all rights 2:father holder 3:current holder 0:no right
|
||||||
*/
|
*/
|
||||||
Integer getHolderLevel(String token, Long taskId);
|
Integer getHolderLevel(String token, Long taskId);
|
||||||
|
|
|
@ -137,6 +137,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
|
||||||
Task task = baseMapper.selectOne(Wrappers.<Task>lambdaQuery().eq(Task::getTaskId, taskId));
|
Task task = baseMapper.selectOne(Wrappers.<Task>lambdaQuery().eq(Task::getTaskId, taskId));
|
||||||
if (task == null || staffId <= 0)
|
if (task == null || staffId <= 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
Integer projectAccessLevel = projectGroupService.getProjectAccessLevel(staffId, staffGlobalLevel, task.getTaskProjectId());
|
||||||
|
if (projectAccessLevel > 0 && projectAccessLevel <= 2) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
int count = 0;
|
int count = 0;
|
||||||
if (task.getTaskHolderId().equals(staffId))
|
if (task.getTaskHolderId().equals(staffId))
|
||||||
count++;
|
count++;
|
||||||
|
@ -326,19 +330,19 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
|
||||||
List<TaskTrendDTO> taskList = new ArrayList<>();
|
List<TaskTrendDTO> taskList = new ArrayList<>();
|
||||||
Boolean existClosed = false;
|
Boolean existClosed = false;
|
||||||
Boolean existCompleted = false;
|
Boolean existCompleted = false;
|
||||||
for(TaskTrendDTO taskTrendDTO: resList) {
|
for (TaskTrendDTO taskTrendDTO : resList) {
|
||||||
if(Objects.equals(Task.STATUS_CLOSED, taskTrendDTO.getTaskStatus())) {
|
if (Objects.equals(Task.STATUS_CLOSED, taskTrendDTO.getTaskStatus())) {
|
||||||
existClosed = true;
|
existClosed = true;
|
||||||
}
|
}
|
||||||
if(Objects.equals(Task.STATUS_COMPLETED, taskTrendDTO.getTaskStatus())) {
|
if (Objects.equals(Task.STATUS_COMPLETED, taskTrendDTO.getTaskStatus())) {
|
||||||
existCompleted = true;
|
existCompleted = true;
|
||||||
}
|
}
|
||||||
taskList.add(taskTrendDTO);
|
taskList.add(taskTrendDTO);
|
||||||
}
|
}
|
||||||
if(!existClosed) {
|
if (!existClosed) {
|
||||||
taskList.add(getZeroNumInstance(Task.STATUS_CLOSED));
|
taskList.add(getZeroNumInstance(Task.STATUS_CLOSED));
|
||||||
}
|
}
|
||||||
if(!existCompleted) {
|
if (!existCompleted) {
|
||||||
taskList.add(getZeroNumInstance(Task.STATUS_COMPLETED));
|
taskList.add(getZeroNumInstance(Task.STATUS_COMPLETED));
|
||||||
}
|
}
|
||||||
TaskTrendDTO unclosedTask = baseMapper.selectUnclosedTaskTrendBeforeDate(projectId, startDate);
|
TaskTrendDTO unclosedTask = baseMapper.selectUnclosedTaskTrendBeforeDate(projectId, startDate);
|
||||||
|
|
Loading…
Reference in New Issue