From 68317d44b233f28150336bbf3aa3a32400552437 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 02 十一月 2026 11:02:08 +0800
Subject: [PATCH] fix(excel): 导入模板日期改为文本显示，修复显示为 Excel 序列号
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
index 7053219..fe4aa48 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
@@ -114,6 +114,15 @@
return success(buildCustomerDetail(customer));
}
+ @GetMapping("/business-get")
+ @Operation(summary = "鑾峰緱涓氬姟妯″潡鍏宠仈瀹㈡埛璇︽儏")
+ @PreAuthorize("isAuthenticated()")
+ public CommonResult<CrmCustomerRespVO> getBusinessCustomer(@RequestParam("id") Long id) {
+ CrmCustomerDO customer = customerService.getCustomerList(java.util.Collections.singleton(id))
+ .stream().findFirst().orElse(null);
+ return success(buildCustomerDetail(customer));
+ }
+
public CrmCustomerRespVO buildCustomerDetail(CrmCustomerDO customer) {
if (customer == null) {
return null;
@@ -131,6 +140,18 @@
return success(PageResult.empty(pageResult.getTotal()));
}
// 2. 鎷兼帴鏁版嵁
+ return success(new PageResult<>(buildCustomerDetailList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ @GetMapping("/business-page")
+ @Operation(summary = "鑾峰緱涓氬姟妯″潡瀹㈡埛鍒嗛〉")
+ @PreAuthorize("isAuthenticated()")
+ public CommonResult<PageResult<CrmCustomerRespVO>> getBusinessCustomerPage(
+ @Valid CrmCustomerPageReqVO pageVO) {
+ PageResult<CrmCustomerDO> pageResult = customerService.getBusinessCustomerPage(pageVO);
+ if (CollUtil.isEmpty(pageResult.getList())) {
+ return success(PageResult.empty(pageResult.getTotal()));
+ }
return success(new PageResult<>(buildCustomerDetailList(pageResult.getList()), pageResult.getTotal()));
}
@@ -260,17 +281,17 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱瀵煎叆瀹㈡埛妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 绀轰緥瀹㈡埛锛氬悕绉�/鎵嬫満/閭鍧囦娇鐢ㄥ崰浣嶅�硷紝閬垮厤鐓ф妱瀹樻柟 demo 浜х敓鍋囨暟鎹�
List<CrmCustomerImportExcelVO> list = Arrays.asList(
- CrmCustomerImportExcelVO.builder().name("瓒呯骇绠＄悊鍛�").industryId(1).level(1).source(1)
- .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").autoPoolEnabled(true).build(),
- CrmCustomerImportExcelVO.builder().name("婧愮爜").industryId(1).level(1).source(1)
- .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").autoPoolEnabled(true).build()
+ CrmCustomerImportExcelVO.builder().name("绀轰緥瀹㈡埛A锛堣鏇挎崲锛�").industryId(1).level(1).source(1)
+ .mobile("13800000001").telephone("").qq("").wechat("").email("customerA@example.com")
+ .areaId(null).detailAddress("").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").autoPoolEnabled(true).build(),
+ CrmCustomerImportExcelVO.builder().name("绀轰緥瀹㈡埛B锛堣鏇挎崲锛�").industryId(1).level(1).source(1)
+ .mobile("13800000002").telephone("").qq("").wechat("").email("customerB@example.com")
+ .areaId(null).detailAddress("").remark("绀轰緥鏁版嵁锛屽鍏ュ墠璇锋浛鎹�").autoPoolEnabled(true).build()
);
// 杈撳嚭
- ExcelUtils.write(response, "瀹㈡埛瀵煎叆妯℃澘.xls", "瀹㈡埛鍒楄〃", CrmCustomerImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "瀹㈡埛瀵煎叆妯℃澘.xls", "瀹㈡埛鍒楄〃", CrmCustomerImportExcelVO.class, list);
}
@PostMapping("/import")
--
Gitblit v1.9.3