diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index 8b2e9d8..e2e46d5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -781,6 +781,12 @@ public class ProjectLibManage { ProjectHelper::convertVO) )); + //审批信息 + ProcessDetailReq req = new ProcessDetailReq(); + req.setInstanceId(projectInfo.getInstCode()); + req.setProjectId(projectId); + vo.setProcess(todoService.getProcessDetail(req)); + List allVersionProjectId = projectService.getAllVersionProjectId(projectInfo); //查询采购备案 Purchase purchase = purchaseService.getOne(Wrappers.lambdaQuery(Purchase.class) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java index 044873d..49349e4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java @@ -10,6 +10,7 @@ import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsAcceptancePersonVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PurchaseVO; import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; +import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -391,6 +392,9 @@ public class ProjectDetailVO { @ApiModelProperty("区县预审盖章上级条线主管单位印章编号") private String countrySealNo; + @ApiModelProperty("审批详情") + private ProcessProgressDetailVo process; + public String getVersionStr() { if (Objects.nonNull(this.newest) && this.newest) { this.versionStr = "当前版本";