From cdaec80a5ffa474f69e5c36f0312be3c0abf2210 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 18:31:11 +0800
Subject: [PATCH] feat(crm): 投标保证金迁移到销售管理并关联销售台账
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
index 85770d4..2f18b8e 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
@@ -63,29 +63,34 @@
@GetMapping("/get")
@Operation(summary = "鑾峰彇渚涘簲鍟嗚鎯�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('srm:supplier:query')")
public CommonResult<SrmSupplierRespVO> getSupplier(@RequestParam("id") Long id) {
SrmSupplierDO supplier = supplierService.getSupplier(id);
- return success(BeanUtils.toBean(supplier, SrmSupplierRespVO.class));
+ SrmSupplierRespVO respVO = BeanUtils.toBean(supplier, SrmSupplierRespVO.class);
+ if (respVO != null) {
+ respVO.setContacts(BeanUtils.toBean(supplierService.getSupplierContactList(id),
+ SrmSupplierContactRespVO.class));
+ respVO.setBanks(BeanUtils.toBean(supplierService.getSupplierBankList(id),
+ SrmSupplierBankRespVO.class));
+ }
+ return success(respVO);
}
@GetMapping("/page")
@Operation(summary = "渚涘簲鍟嗗垎椤垫煡璇�")
- @PreAuthorize("@ss.hasPermission('srm:supplier:query')")
public CommonResult<PageResult<SrmSupplierRespVO>> getSupplierPage(@Valid SrmSupplierPageReqVO pageReqVO) {
PageResult<SrmSupplierDO> pageResult = supplierService.getSupplierPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, SrmSupplierRespVO.class));
}
@GetMapping("/simple-list")
- @Operation(summary = "鑾峰彇渚涘簲鍟嗙簿绠�鍒楄〃锛堜粎杩斿洖宸查�氳繃鍑嗗叆瀹℃壒鐨勪緵搴斿晢锛�")
+ @Operation(summary = "鑾峰彇渚涘簲鍟嗙簿绠�鍒楄〃锛堜粎杩斿洖鍚敤鐘舵�佺殑渚涘簲鍟嗭級")
public CommonResult<List<SrmSupplierRespVO>> getSupplierSimpleList() {
List<SrmSupplierDO> list = supplierService.getSupplierSimpleList();
return success(BeanUtils.toBean(list, SrmSupplierRespVO.class));
}
@GetMapping("/list")
- @Operation(summary = "鑾峰彇渚涘簲鍟嗘。妗堝垪琛紙涓嶈繃婊ゅ噯鍏ョ姸鎬侊級")
+ @Operation(summary = "鑾峰彇渚涘簲鍟嗘。妗堝垪琛紙鎺掗櫎鍋滅敤渚涘簲鍟嗭級")
public CommonResult<List<SrmSupplierRespVO>> getSupplierAllList() {
List<SrmSupplierDO> list = supplierService.getSupplierAllList();
return success(BeanUtils.toBean(list, SrmSupplierRespVO.class));
--
Gitblit v1.9.3