From 1d80ee957e9a0c8f7067ff80cc4dbc79091b08ca Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Wed, 4 Dec 2024 10:32:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E4=B8=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BpmOAProcureDO 中添加 projectNo 字段，用于存储项目编号 - 在 BpmOAProcureRespVO 中添加 projectNo 和 projectName 字段，用于展示项目编号和名称 - 在 BpmOAProcureSaveReqVO 中添加 projectNo 字段，允许用户在创建采购申请时选择项目 - 修改 BpmOAProcureController 中的 getOaProcure 和 getByProcessInstanceId 方法，通过 ProjectApi 获取项目名称并设置到响应中 --- .../admin/oa/BpmOAProcureController.java | 21 +++++++++++++++++-- .../oa/vo/procure/BpmOAProcureRespVO.java | 6 ++++++ .../oa/vo/procure/BpmOAProcureSaveReqVO.java | 3 +++ .../bpm/dal/dataobject/oa/BpmOAProcureDO.java | 4 ++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java index 6db95061..624dcc2a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcureSa import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAProcureConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAProcureDO; import cn.iocoder.yudao.module.bpm.service.oa.BpmOAProcureService; +import cn.iocoder.yudao.module.system.api.project.ProjectApi; +import cn.iocoder.yudao.module.system.api.project.dto.ProjectDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,6 +29,9 @@ public class BpmOAProcureController { @Resource private BpmOAProcureService bpmOaProcureService; + @Resource + private ProjectApi projectApi; + @PostMapping("/create") @Operation(summary = "创建OA 采购申请") // @PreAuthorize("@ss.hasPermission('bpm:oa-procure:create')") @@ -57,7 +62,13 @@ public class BpmOAProcureController { // @PreAuthorize("@ss.hasPermission('bpm:oa-procure:query')") public CommonResult getOaProcure(@RequestParam("id") Long id) { BpmOAProcureDO oaProcure = bpmOaProcureService.getOaProcure(id); - return success(BpmOAProcureConvert.INSTANCE.convert(oaProcure)); + BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure); + if (respVO != null && respVO.getProjectNo() != null) { + ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData(); + respVO.setProjectName(projectDTO.getName()); + } + + return success(respVO); } @@ -74,7 +85,13 @@ public class BpmOAProcureController { public CommonResult getByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) { BpmOAProcureDO oaProcure = bpmOaProcureService.getByProcessInstanceId(processInstanceId); - return success(BpmOAProcureConvert.INSTANCE.convert(oaProcure)); + BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure); + if (respVO != null && respVO.getProjectNo() != null) { + ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData(); + respVO.setProjectName(projectDTO.getName()); + } + + return success(respVO); } } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java index dc1d63c4..4413f6a5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureRespVO.java @@ -22,6 +22,12 @@ public class BpmOAProcureRespVO { @Schema(description = "申请人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "26976") private Long userId; + @Schema(description = "项目编号", example = "26976") + private String projectNo; + + @Schema(description = "项目名称", example = "26976") + private String projectName; + @Schema(description = "申请事由", example = "不喜欢") private String reason; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java index 80d5ad10..43c184a8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/procure/BpmOAProcureSaveReqVO.java @@ -21,6 +21,9 @@ public class BpmOAProcureSaveReqVO { @Schema(description = "申请人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "26976") private Long userId; + @Schema(description = "项目编号", example = "26976") + private String projectNo; + @Schema(description = "申请事由", example = "不喜欢") private String reason; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java index 09c8ae58..89f4ea07 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAProcureDO.java @@ -49,6 +49,10 @@ public class BpmOAProcureDO extends BaseDO { * 申请人的用户编号 */ private Long userId; + /** + * 项目编号 + */ + private String projectNo; /** * 申请事由 */