Browse Source

任务列表返回检查人和负责人的名称

recovery
hyy-alt 5 years ago
parent
commit
1c586108df
  1. 2
      tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java
  2. 12
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

2
tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java

@ -122,6 +122,8 @@ public interface ProRoleDao extends ProRoleMapper{
List<ProjectVo.ProMemberVo> selectMemberOfRole(Long roleId); List<ProjectVo.ProMemberVo> selectMemberOfRole(Long roleId);
// /** // /**
// * 查找项目下的所有成员的名字用“,”分隔 // * 查找项目下的所有成员的名字用“,”分隔
// * @param projectId 项目id // * @param projectId 项目id

12
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()); taskInfoByRoleId.setEndTime(taskInfoByRoleId.getEndTime() == null ? sysProject.getEndTime() : taskInfoByRoleId.getEndTime());
Object obj = null; Object obj = null;
ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId()); ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId()); //查到了项目下的角色信息
if (ObjectUtil.isNull(role)) { if (ObjectUtil.isNull(role)) {
throw new BaseException(CodeEnum.NOT_ROLE); throw new BaseException(CodeEnum.NOT_ROLE);
} }
ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId()); ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId()); //查到了项目下的父角色信息
if (ObjectUtil.isNull(parentRole)) { if (ObjectUtil.isNull(parentRole)) {
throw new BaseException(CodeEnum.NOT_ROLE); throw new BaseException(CodeEnum.NOT_ROLE);
} }
@ -418,6 +418,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
// normalTask.setScore(score); // 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); managePlugin(currentUserId, roleId, normalTask, imitation);
//任务完成状态 //任务完成状态

Loading…
Cancel
Save