Browse Source

历史版本里也加入审批信息

tags/24080901
PoffyZhang 1 year ago
parent
commit
1f4c9f7b9f
2 changed files with 10 additions and 0 deletions
  1. +6
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
  2. +4
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

+ 6
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java View File

@@ -781,6 +781,12 @@ public class ProjectLibManage {
ProjectHelper::convertVO) ProjectHelper::convertVO)
)); ));


//审批信息
ProcessDetailReq req = new ProcessDetailReq();
req.setInstanceId(projectInfo.getInstCode());
req.setProjectId(projectId);
vo.setProcess(todoService.getProcessDetail(req));

List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectInfo); List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectInfo);
//查询采购备案 //查询采购备案
Purchase purchase = purchaseService.getOne(Wrappers.lambdaQuery(Purchase.class) Purchase purchase = purchaseService.getOne(Wrappers.lambdaQuery(Purchase.class)


+ 4
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java View File

@@ -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.PreInsAcceptancePersonVO;
import com.ningdatech.pmapi.projectdeclared.model.vo.PurchaseVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PurchaseVO;
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -391,6 +392,9 @@ public class ProjectDetailVO {
@ApiModelProperty("区县预审盖章上级条线主管单位印章编号") @ApiModelProperty("区县预审盖章上级条线主管单位印章编号")
private String countrySealNo; private String countrySealNo;


@ApiModelProperty("审批详情")
private ProcessProgressDetailVo process;

public String getVersionStr() { public String getVersionStr() {
if (Objects.nonNull(this.newest) && this.newest) { if (Objects.nonNull(this.newest) && this.newest) {
this.versionStr = "当前版本"; this.versionStr = "当前版本";


Loading…
Cancel
Save