From 6ddf6a025438379d0b195987820e19271439bfe6 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 10 Jul 2023 17:40:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E5=80=9F=E9=98=85?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java | 6 ++++++ .../ningdatech/pmapi/filemanage/model/vo/ProjectApplyBorrowVO.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java index 882ca05..fb8b8b8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java @@ -556,6 +556,12 @@ public class ProjectFileManage { vo.setApplyBorrowEmpPosUnitName(organization.getOrganizationName()); } } + if(Objects.nonNull(vo.getProjectId())){ + Project project = projectService.getById(vo.getProjectId()); + if(Objects.nonNull(project)){ + vo.setProjectName(project.getProjectName()); + } + } return vo; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/vo/ProjectApplyBorrowVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/vo/ProjectApplyBorrowVO.java index 1e8e426..9dfdcba 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/vo/ProjectApplyBorrowVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/vo/ProjectApplyBorrowVO.java @@ -27,6 +27,9 @@ public class ProjectApplyBorrowVO implements Serializable { @ApiModelProperty("借阅项目ID") private Long projectId; + @ApiModelProperty("借阅项目名") + private String projectName; + @ApiModelProperty("申请借阅员工code") private String applyBorrowEmployeeCode;