From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java
index 8126210..abed6e7 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java
@@ -5,6 +5,8 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.*;
import cn.iocoder.yudao.module.srm.service.tender.SrmTenderProjectService;
+import cn.iocoder.yudao.module.srm.service.tender.SrmTenderProjectServiceImpl;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,6 +28,9 @@
@Resource
private SrmTenderProjectService tenderProjectService;
+
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鎷涙爣椤圭洰")
@@ -54,14 +59,27 @@
@Operation(summary = "鑾峰彇鎷涙爣椤圭洰璇︽儏")
@PreAuthorize("@ss.hasPermission('srm:tender-project:query')")
public CommonResult<SrmTenderProjectRespVO> getTenderProject(@RequestParam("id") Long id) {
- return success(BeanUtils.toBean(tenderProjectService.getTenderProject(id), SrmTenderProjectRespVO.class));
+ var resp = BeanUtils.toBean(tenderProjectService.getTenderProject(id), SrmTenderProjectRespVO.class);
+ enrichAttachments(List.of(resp));
+ return success(resp);
}
@GetMapping("/page")
@Operation(summary = "鑾峰彇鎷涙爣椤圭洰鍒嗛〉")
@PreAuthorize("@ss.hasPermission('srm:tender-project:query')")
public CommonResult<PageResult<SrmTenderProjectRespVO>> getTenderProjectPage(@Valid SrmTenderProjectPageReqVO pageReqVO) {
- return success(BeanUtils.toBean(tenderProjectService.getTenderProjectPage(pageReqVO), SrmTenderProjectRespVO.class));
+ var pageResult = tenderProjectService.getTenderProjectPage(pageReqVO);
+ var respList = BeanUtils.toBean(pageResult.getList(), SrmTenderProjectRespVO.class);
+ enrichAttachments(respList);
+ return success(new PageResult<>(respList, pageResult.getTotal()));
+ }
+
+ // ========== 鍏宠仈鏁版嵁濉厖 ==========
+
+ private void enrichAttachments(List<SrmTenderProjectRespVO> list) {
+ if (list == null || list.isEmpty()) return;
+ list.forEach(vo -> vo.setAttachmentList(storageAttachmentApi.listAttachments(
+ SrmTenderProjectServiceImpl.TENDER_PROJECT_RECORD_TYPE, vo.getId())));
}
@PutMapping("/publish")
--
Gitblit v1.9.3