diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java index b6428736..b3fd7016 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java @@ -122,6 +122,8 @@ public interface ProRoleDao extends ProRoleMapper{ List selectMemberOfRole(Long roleId); + + // /** // * 查找项目下的所有成员的名字用“,”分隔 // * @param projectId 项目id diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 9e5e32b9..aba905a0 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -109,11 +109,11 @@ public class ProTaskDetailService implements IProTaskDetailService { taskInfoByRoleId.setEndTime(taskInfoByRoleId.getEndTime() == null ? sysProject.getEndTime() : taskInfoByRoleId.getEndTime()); Object obj = null; - ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId()); + ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId()); //查到了项目下的角色信息 if (ObjectUtil.isNull(role)) { throw new BaseException(CodeEnum.NOT_ROLE); } - ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId()); + ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId()); //查到了项目下的父角色信息 if (ObjectUtil.isNull(parentRole)) { throw new BaseException(CodeEnum.NOT_ROLE); } @@ -418,6 +418,14 @@ public class ProTaskDetailService implements IProTaskDetailService { // normalTask.setScore(score); // } // } + //通过角色id查找 负责人名称 检查人名称 + Long executorRole = normalTask.getExecutorRole(); + ProRole proRole = proRoleDao.selectByPrimaryKey(executorRole); + normalTask.setExecutorRoleName(proRole.getName()); + Long checkerRole = normalTask.getCheckerRole(); + ProRole proRole1 = proRoleDao.selectByPrimaryKey(checkerRole); + normalTask.setCheckerRoleName(proRole1.getName()); + //处理插件 managePlugin(currentUserId, roleId, normalTask, imitation); //任务完成状态 diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml index 9ba713c6..f991ca6b 100644 --- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml @@ -132,7 +132,7 @@ AND (c.place_location = 0 or c.id is null) group by s.task_detail_id,sp.id - )t + ) t GROUP BY t.tSubTimeId order by diff --git a/tall/src/main/resources/mapper_raw/ProRoleMapper.xml b/tall/src/main/resources/mapper_raw/ProRoleMapper.xml index b3775227..1e28879b 100644 --- a/tall/src/main/resources/mapper_raw/ProRoleMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProRoleMapper.xml @@ -86,8 +86,8 @@ - order by ${orderByClause} - + order by ${orderByClause} +