From ff61feb990cbe2a7be5b790566b3aff9f16005e5 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 09:33:14 +0800
Subject: [PATCH] feat: 销售台账导入新增字段
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 143 +++++++++++++++++++++++++++--------------------
1 files changed, 81 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index b7cb426..20ede93 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -13,16 +13,13 @@
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.CustomerFollowUp;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
-import com.ruoyi.basic.service.CustomerFollowUpFileService;
-import com.ruoyi.basic.service.CustomerFollowUpService;
-import com.ruoyi.basic.service.CustomerReturnVisitService;
-import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.basic.pojo.CustomerRegions;
+import com.ruoyi.basic.service.*;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
@@ -59,6 +56,8 @@
private CustomerReturnVisitService customerReturnVisitService;
+ private final ICustomerRegionsService customerRegionsService;
+
/**
* 鏌ヨ瀹㈡埛妗ｆ
*
@@ -87,92 +86,112 @@
BeanUtils.copyProperties(customer, dto);
// 鏌ヨ璺熻繘璁板綍
- List<CustomerFollowUp> followUpList = customerFollowUpService.list(
- new LambdaQueryWrapper<CustomerFollowUp>()
- .eq(CustomerFollowUp::getCustomerId, id)
- .orderByDesc(CustomerFollowUp::getFollowUpTime)
- );
-
- if (!CollectionUtils.isEmpty(followUpList)) {
- List<CustomerFollowUpDto> followUpDtoList = followUpList.stream().map(followUp -> {
- CustomerFollowUpDto followUpDto = new CustomerFollowUpDto();
- BeanUtils.copyProperties(followUp, followUpDto);
-
- // 鏌ヨ闄勪欢
- List<CustomerFollowUpFile> fileList = customerFollowUpFileService.list(
- new LambdaQueryWrapper<CustomerFollowUpFile>()
- .eq(CustomerFollowUpFile::getFollowUpId, followUp.getId())
- );
- followUpDto.setFileList(fileList);
-
- return followUpDto;
- }).collect(Collectors.toList());
-
- dto.setFollowUpList(followUpDtoList);
+// List<CustomerFollowUp> followUpList = customerFollowUpService.list(
+// new LambdaQueryWrapper<CustomerFollowUp>()
+// .eq(CustomerFollowUp::getCustomerId, id)
+// .orderByDesc(CustomerFollowUp::getFollowUpTime)
+// );
+//
+// if (!CollectionUtils.isEmpty(followUpList)) {
+// List<CustomerFollowUpDto> followUpDtoList = followUpList.stream().map(followUp -> {
+// CustomerFollowUpDto followUpDto = new CustomerFollowUpDto();
+// BeanUtils.copyProperties(followUp, followUpDto);
+//
+// // 鏌ヨ闄勪欢
+// List<CustomerFollowUpFile> fileList = customerFollowUpFileService.list(
+// new LambdaQueryWrapper<CustomerFollowUpFile>()
+// .eq(CustomerFollowUpFile::getFollowUpId, followUp.getId())
+// );
+// followUpDto.setFileList(fileList);
+//
+// return followUpDto;
+// }).collect(Collectors.toList());
+//
+// dto.setFollowUpList(followUpDtoList);
+// }
+ // 鍦板尯鍚嶇О
+ CustomerRegions customerRegions = customerRegionsService.getById(customer.getRegionsId());
+ if (customerRegions != null) {
+ dto.setRegionsName(customerRegions.getRegionsName());
}
-
return dto;
}
/**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*
- * @param customer 瀹㈡埛妗ｆ
- * @return 瀹㈡埛妗ｆ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param customer 瀹㈡埛鏌ヨ鏉′欢
+ * @return 瀹㈡埛妗ｆ鍒嗛〉鍒楄〃
*/
@Override
- public IPage<Customer> selectCustomerList(Page<Customer> page, Customer customer) {
- // 1. 澶勭悊绌哄�煎満鏅紙鍙傛暟鏍￠獙锛�
- if (page == null) {
- page = Page.of(1, 10); // 榛樿绗�1椤碉紝姣忛〉10鏉℃暟鎹�
- }
- if (customer == null) {
- customer = new Customer(); // 閬垮厤绌哄璞″鑷寸殑NPE
- }
+ public IPage<CustomerDto> selectCustomerList(Page<Customer> page, Customer customer) {
+ if (page == null) page = Page.of(1, 10);
+ if (customer == null) customer = new Customer();
- // 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
String customerName = customer.getCustomerName();
String customerType = customer.getCustomerType();
+ Long regionsId = customer.getRegionsId();
+
if (StringUtils.isNotBlank(customerName)) {
queryWrapper.like(Customer::getCustomerName, customerName);
}
if (StringUtils.isNotBlank(customerType)) {
- queryWrapper.like(Customer::getCustomerType, customerType);
+ queryWrapper.eq(Customer::getCustomerType, customerType);
}
- // 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
+ if (regionsId != null) {
+ // 璋冪敤 regionsService 鑾峰彇褰撳墠鍦板尯鍙婂叾鎵�鏈夊悗浠ｇ殑 ID 闆嗗悎
+ List<Long> allRegionsIds = customerRegionsService.regionsChildrenIds(regionsId);
+ if (!CollectionUtils.isEmpty(allRegionsIds)) {
+ queryWrapper.in(Customer::getRegionsId, allRegionsIds);
+ } else {
+ queryWrapper.eq(Customer::getRegionsId, regionsId);
+ }
+ }
+
IPage<Customer> customerPage = customerMapper.selectPage(page, queryWrapper);
- // 4. 鏁版嵁澶勭悊锛堝寮虹┖鍊煎畨鍏� & 浠ｇ爜鍙鎬э級
- List<Customer> processedList = customerPage.getRecords().stream()
- .filter(Objects::nonNull) // 杩囨护绌哄璞★紙閬垮厤鍚庣画鎿嶄綔NPE锛�
- .peek(c -> {
- // 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
+ List<CustomerDto> dtoList = customerPage.getRecords().stream()
+ .filter(Objects::nonNull)
+ .map(c -> {
+ CustomerDto dto = new CustomerDto();
+ BeanUtils.copyProperties(c, dto);
+
+ // 鍦板潃鐢佃瘽鎷兼帴
String address = StringUtils.defaultString(c.getCompanyAddress(), "");
String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
- c.setAddressPhone(address + "(" + phone + ")");
+ dto.setAddressPhone(address + "(" + phone + ")");
+
+ // 濉厖鍦板尯鍚嶇О
+ if (c.getRegionsId() != null) {
+ CustomerRegions regions = customerRegionsService.getById(c.getRegionsId());
+ if (regions != null) {
+ dto.setRegionsName(regions.getRegionsName());
+ }
+ }
// 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
- CustomerFollowUp followUp = customerFollowUpService.getOne(
- new LambdaQueryWrapper<CustomerFollowUp>()
- .eq(CustomerFollowUp::getCustomerId, c.getId())
- .orderByDesc(CustomerFollowUp::getFollowUpTime)
- .last("LIMIT 1")
- );
-
- if (followUp != null) {
- c.setFollowUpLevel(followUp.getFollowUpLevel());
- c.setFollowUpTime(followUp.getFollowUpTime());
- }
+// CustomerFollowUp followUp = customerFollowUpService.getOne(
+// new LambdaQueryWrapper<CustomerFollowUp>()
+// .eq(CustomerFollowUp::getCustomerId, c.getId())
+// .orderByDesc(CustomerFollowUp::getFollowUpTime)
+// .last("LIMIT 1")
+// );
+//
+// if (followUp != null) {
+// dto.setFollowUpLevel(followUp.getFollowUpLevel());
+// dto.setFollowUpTime(Date.from(followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()));
+// }
+ return dto;
})
.collect(Collectors.toList());
- // 5. 鏇存柊鍒嗛〉缁撴灉涓殑鏁版嵁锛堜繚鎸佸垎椤典俊鎭畬鏁达級
- IPage<Customer> resultPage = new Page<>(customerPage.getCurrent(), customerPage.getSize(), customerPage.getTotal());
- resultPage.setRecords(processedList);
+ IPage<CustomerDto> resultPage = new Page<>(customerPage.getCurrent(), customerPage.getSize(), customerPage.getTotal());
+ resultPage.setRecords(dtoList);
- return customerPage; // 杩斿洖鍖呭惈鍒嗛〉淇℃伅鐨処Page瀵硅薄
+ return resultPage;
}
/**
--
Gitblit v1.9.3