diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index f37853e..f8b68e1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -22,6 +22,7 @@ import com.ningdatech.basic.util.StrPool; import com.ningdatech.file.entity.File; import com.ningdatech.file.entity.vo.result.FileResultVO; import com.ningdatech.file.service.FileService; +import com.ningdatech.pmapi.common.constant.BizConst; import com.ningdatech.pmapi.common.constant.CommonConst; import com.ningdatech.pmapi.common.constant.RegionConst; import com.ningdatech.pmapi.common.enumeration.CommonEnum; @@ -555,6 +556,10 @@ public class TodoCenterManage { String taskId = request.getTaskId(); ProcessProgressVo progressInstanceDetail = processInstanceService.getProgressInstanceDetail(nodeId, instanceId, taskId); + ProjectInst projectInst = projectInstService.getOne(Wrappers.lambdaQuery(ProjectInst.class) + .eq(ProjectInst::getInstCode, instanceId) + .last(BizConst.LIMIT_1)); + if (Objects.isNull(progressInstanceDetail)) { return null; } @@ -566,9 +571,16 @@ public class TodoCenterManage { isHighLine = checkHighLine(progressInfo, taskId, LoginUserUtil.loginUserDetail()); } ProcessProgressDetailVo res = new ProcessProgressDetailVo(); + if(Objects.nonNull(projectInst)){ + Long projectIdThis = projectInst.getProjectId(); + Project project = projectService.getById(projectIdThis); + res.setProjectCode(project.getProjectCode()); + res.setProjectId(projectInst.getProjectId()); + }else{ + res.setProjectId(request.getProjectId()); + } res.setProcessProgressVo(progressInstanceDetail); res.setStatus(progressInstanceDetail.getStatus()); - res.setProjectId(projectId); res.setCanWithdraw(withDrawHandle.checkCanWithdraw(instanceId, progressInstanceDetail, request.getTaskId())); res.setIsHighLine(isHighLine); res.setConstructionSuggestions(checkConstructionSuggestionsByNodeId(nodeId)); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/ProcessProgressDetailVo.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/ProcessProgressDetailVo.java index 7f6af46..d3c22fa 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/ProcessProgressDetailVo.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/ProcessProgressDetailVo.java @@ -35,6 +35,11 @@ public class ProcessProgressDetailVo { private Long projectId; /** + * 项目编号 + */ + private String projectCode; + + /** * 能否撤回 */ private Boolean canWithdraw = Boolean.FALSE;