Compare commits
2 Commits
6a37f2387e
...
056a5ee8f7
Author | SHA1 | Date |
---|---|---|
ArgonarioD | 056a5ee8f7 | |
ArgonarioD | 87438138be |
|
@ -20,8 +20,6 @@ import java.util.List;
|
|||
public interface TaskMapper extends BaseMapper<Task> {
|
||||
List<TaskDTO> selectTaskList(@Param(Constants.WRAPPER) Wrapper<Task> wrapper);
|
||||
|
||||
List<TaskDTO> selectSubTaskList(@Param("projectId") Integer projectId, @Param("fatherId") Long fatherId);
|
||||
|
||||
List<StaffProcessDTO> selectProjectProcess(@Param("projectId") Integer projectId, @Param("staffId") Integer staffId);
|
||||
|
||||
List<TaskTrendDTO> selectClosedTaskTrendBeforeDate(@Param("projectId") Integer projectId, @Param("startDate") LocalDate startDate);
|
||||
|
|
|
@ -93,12 +93,13 @@ public class ProjectGroupServiceImpl extends ServiceImpl<ProjectGroupMapper, Pro
|
|||
@Override
|
||||
public Boolean updateStaffPositions(String token, Integer projectId, Integer targetId, String positions) throws ForbiddenException {
|
||||
int accessLevel = getProjectAccessLevel(token, projectId);
|
||||
int targetLevel = getProjectAccessLevel(targetId, 2, projectId); //假定目标的全局level为2,防止get时出现问题
|
||||
int originTargetLevel = getProjectAccessLevelIgnoreGlobalLevel(targetId, projectId);
|
||||
int targetLevel = 3;
|
||||
|
||||
if (accessLevel == 0) {
|
||||
throw new ForbiddenException(IProjectGroupService.UNABLE_TO_ACCESS_PROJECT);
|
||||
}
|
||||
if (accessLevel > 2 || accessLevel >= targetLevel) {
|
||||
if (accessLevel > 2 || accessLevel >= originTargetLevel) {
|
||||
throw new ForbiddenException(ForbiddenException.UNABLE_TO_OPERATE);
|
||||
}
|
||||
String[] positionArray = positions.split(",");
|
||||
|
|
|
@ -45,7 +45,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
|
|||
if (fatherId == null) {
|
||||
throw new BadRequestException(BadRequestException.WRONG_PARAMETERS);
|
||||
}
|
||||
return baseMapper.selectSubTaskList(projectId, fatherId);
|
||||
return baseMapper.selectTaskList(Wrappers.<Task>lambdaQuery()
|
||||
.eq(Task::getTaskProjectId, projectId)
|
||||
.eq(Task::getTaskFatherId, fatherId)
|
||||
.eq(Task::getDeleted, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -27,29 +27,6 @@
|
|||
JOIN (SELECT staff_id, staff_fullname FROM staff) AS s ON t.task_holder_id = s.staff_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
<select id="selectSubTaskList" resultMap="taskDto">
|
||||
SELECT task_id,
|
||||
task_name,
|
||||
task_project_id,
|
||||
task_holder_id,
|
||||
s.staff_fullname AS task_holder_name,
|
||||
task_status,
|
||||
task_type,
|
||||
t.task_father_id,
|
||||
task_created_time,
|
||||
task_start_time,
|
||||
task_end_time,
|
||||
task_closed_time,
|
||||
task_priority,
|
||||
task_description,
|
||||
attached_info,
|
||||
children_count
|
||||
FROM task AS t
|
||||
JOIN (SELECT staff_id, staff_fullname FROM staff) AS s ON t.task_holder_id = s.staff_id
|
||||
WHERE is_deleted = 0
|
||||
AND task_project_id = #{projectId}
|
||||
AND t.task_father_id = #{fatherId}
|
||||
</select>
|
||||
<select id="selectProjectProcess"
|
||||
resultType="cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.StaffProcessDTO">
|
||||
SELECT task_type,
|
||||
|
|
Loading…
Reference in New Issue