From 4bc513be11e671caf20ec6013a51dee42c2ed96e Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 18:31:26 +0800
Subject: [PATCH] fix(crm): 禁止物料类合同开票
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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..c64f0b0 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;
@@ -39,6 +40,8 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
@@ -91,7 +94,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑱旂郴浜�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:contact:query')")
public CommonResult<CrmContactRespVO> getContact(@RequestParam("id") Long id) {
CrmContactDO contact = contactService.getContact(id);
return success(buildContactDetail(contact));
@@ -106,7 +108,6 @@
@GetMapping("/simple-all-list")
@Operation(summary = "鑾峰緱鑱旂郴浜虹殑绮剧畝鍒楄〃")
- @PreAuthorize("@ss.hasPermission('crm:contact:query')")
public CommonResult<List<CrmContactRespVO>> getSimpleContactList() {
List<CrmContactDO> list = contactService.getContactList(getLoginUserId());
return success(convertList(list, contact -> // 鍙繑鍥� id銆乶ame 瀛楁
@@ -114,9 +115,18 @@
.setCustomerId(contact.getCustomerId())));
}
+ @GetMapping("/list-by-customer")
+ @Operation(summary = "鑾峰緱鑱旂郴浜哄垪琛紝鍩轰簬鎸囧畾瀹㈡埛")
+ @Parameter(name = "customerId", description = "瀹㈡埛缂栧彿", required = true)
+ 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')")
public CommonResult<PageResult<CrmContactRespVO>> getContactPage(@Valid CrmContactPageReqVO pageVO) {
PageResult<CrmContactDO> pageResult = contactService.getContactPage(pageVO, getLoginUserId());
return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
@@ -125,7 +135,9 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱鑱旂郴浜哄垎椤碉紝鍩轰簬鎸囧畾瀹㈡埛")
public CommonResult<PageResult<CrmContactRespVO>> getContactPageByCustomer(@Valid CrmContactPageReqVO pageVO) {
- Assert.notNull(pageVO.getCustomerId(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getCustomerId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "瀹㈡埛缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContactDO> pageResult = contactService.getContactPageByCustomerId(pageVO);
return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
}
@@ -133,7 +145,9 @@
@GetMapping("/page-by-business")
@Operation(summary = "鑾峰緱鑱旂郴浜哄垎椤碉紝鍩轰簬鎸囧畾鍟嗘満")
public CommonResult<PageResult<CrmContactRespVO>> getContactPageByBusiness(@Valid CrmContactPageReqVO pageVO) {
- Assert.notNull(pageVO.getBusinessId(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ if (pageVO.getBusinessId() == null) {
+ throw exception0(BAD_REQUEST.getCode(), "鍟嗘満缂栧彿涓嶈兘涓虹┖");
+ }
PageResult<CrmContactDO> pageResult = contactService.getContactPageByBusinessId(pageVO);
return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
}
@@ -149,6 +163,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