From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 155 insertions(+), 22 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 3dd42a9..b4b0232 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -2,21 +2,36 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
+import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.mapper.CustomerMapper;
+import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.CustomerFollowUp;
+import com.ruoyi.basic.pojo.CustomerPrivatePool;
+import com.ruoyi.basic.service.CustomerFollowUpService;
+import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.basic.service.ICustomerService;
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 lombok.AllArgsConstructor;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.Arrays;
-import java.util.List;
+import java.time.ZoneId;
+import java.util.*;
import java.util.stream.Collectors;
@@ -27,10 +42,15 @@
* @date 2025-05-07
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
- private CustomerMapper customerMapper;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
+ private final CustomerMapper customerMapper;
+
+ private final CustomerFollowUpService customerFollowUpService;
+ private final CustomerReturnVisitService customerReturnVisitService;
/**
* 鏌ヨ瀹㈡埛妗ｆ
@@ -44,25 +64,70 @@
}
/**
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+ *
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @return 瀹㈡埛璇︽儏DTO
+ */
+ @Override
+ public Customer selectCustomerDetailById(Long id) {
+ return this.getById( id);
+ }
+
+ /**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ
*/
@Override
- public List<Customer> selectCustomerList(Customer customer) {
- LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
+ public IPage<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
+ IPage<CustomerDto> customerPage = customerMapper.listPage(page, customer);
- if (StringUtils.isNotBlank(customer.getCustomerName())) {
- queryWrapper.eq(Customer::getCustomerName, customer.getCustomerName());
+ List<CustomerDto> records = customerPage.getRecords();
+ if (CollectionUtils.isEmpty(records)) {
+ return customerPage;
}
- List<Customer> customerList = customerMapper.selectList(queryWrapper);
+ List<Long> customerIds = records.stream()
+ .map(CustomerDto::getId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
- // 浣跨敤 Stream 淇敼姣忎釜 Customer 鐨� addressPhone 瀛楁
- return customerList.stream().peek(c ->
- c.setAddressPhone(c.getCompanyAddress() + "( " + c.getCompanyPhone() + " )")
- ).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(customerIds)) {
+ Map<Long, CustomerFollowUp> latestFollowUpMap = getLatestFollowUpMap(customerIds);
+
+ records.forEach(c -> {
+ String address = StringUtils.defaultString(c.getCompanyAddress(), "");
+ String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
+ c.setAddressPhone(address + "(" + phone + ")");
+
+ CustomerFollowUp followUp = latestFollowUpMap.get(c.getId());
+ if (followUp != null) {
+ c.setFollowUpLevel(followUp.getFollowUpLevel());
+ c.setFollowUpTime(Date.from(
+ followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
+ ));
+ }
+ });
+ }
+
+ return customerPage;
+ }
+
+ private Map<Long, CustomerFollowUp> getLatestFollowUpMap(List<Long> customerIds) {
+ List<CustomerFollowUp> followUps = customerFollowUpService.list(
+ new LambdaQueryWrapper<CustomerFollowUp>()
+ .in(CustomerFollowUp::getCustomerPrivatePoolId, customerIds)
+ .orderByDesc(CustomerFollowUp::getFollowUpTime)
+ );
+
+ return followUps.stream()
+ .collect(Collectors.toMap(
+ CustomerFollowUp::getCustomerPrivatePoolId,
+ followUp -> followUp,
+ (existing, replacement) -> existing
+ ));
}
/**
@@ -74,8 +139,8 @@
@Override
public int insertCustomer(Customer customer) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- customer.setTenantId(Long.valueOf(tenantId));
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
return customerMapper.insert(customer);
}
@@ -88,8 +153,8 @@
@Override
public int updateCustomer(Customer customer) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- customer.setTenantId(Long.valueOf(tenantId));
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
return customerMapper.updateById(customer);
}
@@ -100,8 +165,23 @@
* @return 缁撴灉
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public int deleteCustomerByIds(Long[] ids) {
List<Long> idList = Arrays.asList(ids);
+ List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new QueryWrapper<SalesLedger>().lambda().in(SalesLedger::getCustomerId, idList));
+ if (!salesLedgers.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁閿�鍞悎鍚岋紝璇峰厛鍒犻櫎閿�鍞悎鍚�");
+ }
+ List<CustomerPrivatePool> customerPrivatePools = customerPrivatePoolMapper.selectList(new QueryWrapper<CustomerPrivatePool>().lambda().in(CustomerPrivatePool::getCustomerId, idList));
+ if (!customerPrivatePools.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁瀹㈡埛绉佹捣锛岃鍏堟敹鍥炵娴锋暟鎹�");
+ }
+ // 鍒犻櫎瀹㈡埛鐨勫悓鏃朵篃闇�瑕佸垹闄ゅ搴旂殑瀹㈡埛璺熼殢銆侀檮浠跺拰鍥炶鎻愰啋
+ for (Long id : ids) {
+ customerFollowUpService.deleteByCustomerId(id);
+ customerReturnVisitService.deleteByCustomerId(id);
+ }
+
return customerMapper.deleteBatchIds(idList);
}
@@ -113,9 +193,62 @@
}
@Override
- public List customerList(Customer customer) {
+ public List<Customer> selectCustomerLists(Customer customer) {
+ return customerMapper.selectList(null);
+ }
+
+ @Override
+ public AjaxResult importData(MultipartFile file) {
+ try {
+ ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ List<Customer> userList = util.importExcel(file.getInputStream());
+ if (CollectionUtils.isEmpty(userList)) {
+ return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ }
+ this.saveOrUpdateBatch(userList);
+ return AjaxResult.success(true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return AjaxResult.error("瀵煎叆澶辫触");
+ }
+
+ }
+
+ @Override
+ public List<Map<String, Object>> customerList(Customer customer) {
LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(Customer::getId, Customer::getCustomerName);
- return customerMapper.selectMaps(queryWrapper);
+ queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber);
+
+ // 鑾峰彇鍘熷鏌ヨ缁撴灉
+ List<Map<String, Object>> result = customerMapper.selectMaps(queryWrapper);
+
+ // 灏嗕笅鍒掔嚎鍛藉悕杞崲涓洪┘宄板懡鍚�
+ return result.stream().map(map -> map.entrySet().stream()
+ .collect(Collectors.toMap(
+ entry -> underlineToCamel(entry.getKey()),
+ Map.Entry::getValue))
+ ).collect(Collectors.toList());
+ }
+
+ /**
+ * 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
+ */
+ private String underlineToCamel(String param) {
+ if (param == null || "".equals(param.trim())) {
+ return "";
+ }
+ int len = param.length();
+ StringBuilder sb = new StringBuilder(len);
+ for (int i = 0; i < len; i++) {
+ char c = param.charAt(i);
+ if (c == '_') {
+ if (++i < len) {
+ sb.append(Character.toUpperCase(param.charAt(i)));
+ }
+ } else {
+ sb.append(Character.toLowerCase(c));
+ }
+ }
+ return sb.toString();
}
}
--
Gitblit v1.9.3