From dddc473c582e983674913163dd4e93f840effbdb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:54:55 +0800
Subject: [PATCH] fix(search): 修复多处搜索条件未生效的问题
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
index 58ea20d..a02a809 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
@@ -32,6 +32,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -114,6 +115,17 @@
.setCustomerId(contact.getCustomerId())));
}
+ @GetMapping("/list-by-customer")
+ @Operation(summary = "鑾峰緱鑱旂郴浜哄垪琛紝鍩轰簬鎸囧畾瀹㈡埛")
+ @Parameter(name = "customerId", description = "瀹㈡埛缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('crm:contact:query')")
+ public CommonResult<List<CrmContactRespVO>> getContactListByCustomer(@RequestParam("customerId") Long customerId) {
+ List<CrmContactDO> list = contactService.getContactListByCustomerId(customerId);
+ return success(convertList(list, contact -> // 鍙繑鍥� id銆乶ame 瀛楁
+ new CrmContactRespVO().setId(contact.getId()).setName(contact.getName())
+ .setCustomerId(contact.getCustomerId())));
+ }
+
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑱旂郴浜哄垎椤�")
@PreAuthorize("@ss.hasPermission('crm:contact:query')")
@@ -149,6 +161,27 @@
ExcelUtils.write(response, "鑱旂郴浜�.xls", "鏁版嵁", CrmContactRespVO.class, buildContactDetailList(list));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鑱旂郴浜烘ā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<CrmContactImportExcelVO> list = Arrays.asList(
+ CrmContactImportExcelVO.builder().name("绀轰緥鑱旂郴浜�").customerName("绀轰緥瀹㈡埛")
+ .mobile("13800138000").telephone("").email("").wechat("").post("").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鑱旂郴浜哄鍏ユā鏉�.xls", "鑱旂郴浜哄垪琛�", CrmContactImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鑱旂郴浜�")
+ @PreAuthorize("@ss.hasPermission('crm:contact:import')")
+ public CommonResult<CrmContactImportRespVO> importExcel(@Valid CrmContactImportReqVO importReqVO)
+ throws Exception {
+ List<CrmContactImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), CrmContactImportExcelVO.class);
+ return success(contactService.importContactList(list, importReqVO));
+ }
+
private List<CrmContactRespVO> buildContactDetailList(List<CrmContactDO> contactList) {
if (CollUtil.isEmpty(contactList)) {
return Collections.emptyList();
--
Gitblit v1.9.3