Browse Source

查看任务项目经理下的参数显示

logistics
hyy-alt 4 years ago
parent
commit
be0e781cab
  1. 63
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  2. 1
      tall/src/main/resources/mapper_dao/TaskDetailDao.xml

63
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@ -28,9 +28,11 @@ import com.ccsens.util.exception.BaseException;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sun.xml.internal.fastinfoset.util.ValueArrayResourceException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.record.DVALRecord;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@ -202,6 +204,30 @@ public class ProTaskDetailService implements IProTaskDetailService {
normalTask.setDetailId(firstTaskDetail.getId());
normalTask.setId(taskDeliverService.isTaskOrSubTime(firstTaskDetail.getId()));
normalTask.setSequence(sequence);
if(ObjectUtil.isNotNull(firstTaskDetail.getProjectId())){
SysProject sysProject = sysProjectDao.selectByPrimaryKey(firstTaskDetail.getProjectId());
if(ObjectUtil.isNotNull(sysProject)){
normalTask.setProjectName(sysProject.getName());
}
}
if(ObjectUtil.isNotNull(firstTaskDetail.getExecutorRole())){
ProRole proRole = proRoleDao.selectByPrimaryKey(firstTaskDetail.getExecutorRole());
if(ObjectUtil.isNotNull(proRole)){
normalTask.setExecutorRoleName(proRole.getName());
}
}
if(ObjectUtil.isNotNull(firstTaskDetail.getCheckerRole())){
ProRole proRole = proRoleDao.selectByPrimaryKey(firstTaskDetail.getCheckerRole());
if(ObjectUtil.isNotNull(proRole)){
normalTask.setCheckerRoleName(proRole.getName());
}
}
//firstTaskDetail.getProjectId(); //项目id
//firstTaskDetail.getExecutorRole(); //负责人id
//firstTaskDetail.getCheckerRole(); //检查人id
// 查询任务对应的配置
ProPluginConfigExample configExample = new ProPluginConfigExample();
configExample.createCriteria().andTaskIdEqualTo(firstTaskDetail.getId()).andPlaceLocationEqualTo((byte) 0);
@ -230,6 +256,43 @@ public class ProTaskDetailService implements IProTaskDetailService {
// if (ObjectUtil.isNotNull(score)) {
// task.setScore(score);
// }
ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(task.getDetailId());
if(ObjectUtil.isNotNull(proTaskDetail.getParentId())){
task.setParentId(proTaskDetail.getParentId());
ProTaskDetail proTaskDetail1 = taskDetailDao.selectByPrimaryKey(proTaskDetail.getParentId());
if(ObjectUtil.isNotNull(proTaskDetail1)){
task.setParentName(proTaskDetail1.getName());
}
}else{
task.setParentId(proTaskDetail.getParentId());
}
if(ObjectUtil.isNotNull(proTaskDetail)){
//proTaskDetail.getProjectId()//项目id
//proTaskDetail.getCheckerRole(); //检查人id
//proTaskDetail.getExecutorRole(); // 负责人id
if(ObjectUtil.isNotNull(proTaskDetail.getProjectId())){
SysProject sysProject = sysProjectDao.selectByPrimaryKey(proTaskDetail.getProjectId());
if(ObjectUtil.isNotNull(sysProject)){
task.setProjectName(sysProject.getName());
}
}
if(ObjectUtil.isNotNull(proTaskDetail.getCheckerRole())){
ProRole proRole = proRoleDao.selectByPrimaryKey(proTaskDetail.getCheckerRole());
if(ObjectUtil.isNotNull(proRole)){
task.setExecutorRoleName(proRole.getName());
}
}
if(ObjectUtil.isNotNull(proTaskDetail.getExecutorRole())){
ProRole proRole = proRoleDao.selectByPrimaryKey(proTaskDetail.getExecutorRole());
if(ObjectUtil.isNotNull(proRole)){
task.setCheckerRoleName(proRole.getName());
}
}
}
//处理插件
managePlugin(currentUserId, roleId, task, imitation);
//二级任务完成状态

1
tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@ -162,6 +162,7 @@
d.project_id as tProjectId,
d.description as tDescription,
d.executor_role as tExecutorRole,
d.checker_role as checkerRole,
s.begin_time as tBeginTime,
s.end_time as tEndTime,
d.cycle as tCycle,

Loading…
Cancel
Save