feat(customer): 添加客户档案联系人管理功能

liyong

2026-05-12 72076b86780981136dde2a3faf16c7446f59669d

feat(customer): 添加客户档案联系人管理功能

- 将Customer实体替换为CustomerDto以支持联系人列表
- 在CustomerDto中新增contactList字段存储联系人信息
- 修改Controller层接口参数类型为CustomerDto
- 更新Mapper XML文件查询客户信息时关联联系人数据
- 在CustomerServiceImpl中添加CustomerContactMapper依赖注入
- 实现客户详情查询时同时获取联系人信息
- 添加事务注解确保客户和联系人数据一致性
- 实现syncCustomerContacts方法同步客户联系人关系
- 新增联系人增删改查逻辑和客户ID关联管理
- 优化CustomerVo添加contactList字段返回联系人信息

 src/main/java/com/ruoyi/basic/controller/CustomerController.java

@@ -80,7 +80,7 @@
     */
    @Log(title = "客户档案", businessType = BusinessType.INSERT)
    @PostMapping("/addCustomer")
    public R add(@RequestBody Customer customer) {
    public R add(@RequestBody CustomerDto customer) {
        return R.ok(customerService.insertCustomer(customer));
    }

@@ -89,7 +89,7 @@
     */
    @Log(title = "客户档案", businessType = BusinessType.UPDATE)
    @PostMapping("/updateCustomer")
    public R edit(@RequestBody Customer customer) {
    public R edit(@RequestBody CustomerDto customer) {
        return R.ok(customerService.updateCustomer(customer));
    }


 src/main/java/com/ruoyi/basic/dto/CustomerDto.java

@@ -23,10 +23,12 @@

    private String usageUserName;

    private List<CustomerContactDto> contactList;

    private String togetherUserNames;

    /**
     * 共享用户ID列表
     */
    private List<Long> userIds;
}
}

 src/main/java/com/ruoyi/basic/service/ICustomerService.java

@@ -48,7 +48,7 @@
     * @param customer 客户档案
     * @return 结果
     */
    int insertCustomer(Customer customer);
    int insertCustomer(CustomerDto customer);

    /**
     * 修改客户档案
@@ -56,7 +56,7 @@
     * @param customer 客户档案
     * @return 结果
     */
    int updateCustomer(Customer customer);
    int updateCustomer(CustomerDto customer);

    /**
     * 批量删除客户档案

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -7,13 +7,12 @@
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.CustomerContactDto;
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.mapper.CustomerContactMapper;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.CustomerFollowUp;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.pojo.CustomerUser;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.*;
import com.ruoyi.basic.vo.CustomerVo;
import com.ruoyi.common.utils.SecurityUtils;
@@ -60,6 +59,8 @@
    private CustomerReturnVisitService customerReturnVisitService;
    @Autowired
    private CustomerUserService customerUserService;
    @Autowired
    private CustomerContactMapper customerContactMapper;

    /**
     * 查询客户档案
@@ -105,6 +106,19 @@
            }).collect(Collectors.toList());

            customerVo.setFollowUpList(followUpDtoList);
        }
        //查询联系人信息
        List<CustomerContact> customerContactList = customerContactMapper.selectList(
                new QueryWrapper<CustomerContact>().lambda()
                        .apply("FIND_IN_SET({0}, customer_id)", id)
        );
        if (!CollectionUtils.isEmpty(customerContactList)) {
            List<CustomerContactDto> contactDtoList = customerContactList.stream().map(contact -> {
                CustomerContactDto contactDto = new CustomerContactDto();
                BeanUtils.copyProperties(contact, contactDto);
                return contactDto;
            }).collect(Collectors.toList());
            customerVo.setContactList(contactDtoList);
        }

        return customerVo;
@@ -185,11 +199,14 @@
     * @return 结果
     */
    @Override
    public int insertCustomer(Customer customer) {
    @Transactional(rollbackFor = Exception.class)
    public int insertCustomer(CustomerDto customer) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Long tenantId = loginUser.getTenantId();
        customer.setTenantId(tenantId);
        return customerMapper.insert(customer);
        customerMapper.insert(customer);
        syncCustomerContacts(customer.getId(), customer.getContactList());
        return 1;
    }

    /**
@@ -199,11 +216,118 @@
     * @return 结果
     */
    @Override
    public int updateCustomer(Customer customer) {
    @Transactional(rollbackFor = Exception.class)
    public int updateCustomer(CustomerDto customer) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        Long tenantId = loginUser.getTenantId();
        customer.setTenantId(tenantId);
        return customerMapper.updateById(customer);
        int rows = customerMapper.updateById(customer);
        syncCustomerContacts(customer.getId(), customer.getContactList());
        return rows;
    }

    private void syncCustomerContacts(Long customerId, List<? extends CustomerContact> contactList) {
        List<CustomerContact> allContacts = customerContactMapper.selectList(new QueryWrapper<>());
        Map<String, CustomerContact> submittedContactMap = new LinkedHashMap<>();
        if (!CollectionUtils.isEmpty(contactList)) {
            for (CustomerContact contact : contactList) {
                if (contact == null) {
                    continue;
                }
                submittedContactMap.putIfAbsent(buildContactKey(contact), contact);
            }
        }

        // 先同步本次提交的联系人，按“姓名 + 手机号”聚合客户ID。
        for (CustomerContact contact : submittedContactMap.values()) {
            contact.setCustomerId(buildContactCustomerIds(allContacts, contact, customerId));
            if (contact.getId() == null) {
                customerContactMapper.insert(contact);
                allContacts.add(contact);
            } else {
                customerContactMapper.updateById(contact);
                replaceLocalContact(allContacts, contact);
            }
        }

        Set<String> submittedContactKeys = submittedContactMap.keySet();
        // 再处理本次已删除的联系人，把当前客户从历史关联里移除。
        for (CustomerContact existingContact : new ArrayList<>(allContacts)) {
            if (!containsCustomerId(existingContact.getCustomerId(), customerId)) {
                continue;
            }
            if (submittedContactKeys.contains(buildContactKey(existingContact))) {
                continue;
            }
            String updatedCustomerIds = removeCustomerId(existingContact.getCustomerId(), customerId);
            if (StringUtils.isEmpty(updatedCustomerIds)) {
                // 没有剩余客户关联时，直接删除联系人记录。
                customerContactMapper.deleteById(existingContact.getId());
            } else {
                existingContact.setCustomerId(updatedCustomerIds);
                customerContactMapper.updateById(existingContact);
            }
        }
    }

    // 按联系人姓名和手机号汇总历史客户ID，并追加当前客户ID。
    private String buildContactCustomerIds(List<CustomerContact> customerContacts, CustomerContact contact, Long customerId) {
        LinkedHashSet<String> customerIdSet = new LinkedHashSet<>();
        if (!CollectionUtils.isEmpty(customerContacts)) {
            customerContacts.stream()
                    .filter(Objects::nonNull)
                    .filter(item -> Objects.equals(item.getContactPerson(), contact.getContactPerson())
                            && Objects.equals(item.getContactPhone(), contact.getContactPhone()))
                    .map(CustomerContact::getCustomerId)
                    .filter(StringUtils::isNotEmpty)
                    .forEach(ids -> Arrays.stream(ids.split(","))
                            .map(String::trim)
                            .filter(StringUtils::isNotEmpty)
                            .forEach(customerIdSet::add));
        }
        customerIdSet.add(String.valueOf(customerId));
        return String.join(",", customerIdSet);
    }

    // 判断联系人关联列表里是否包含当前客户ID。
    private boolean containsCustomerId(String customerIds, Long customerId) {
        if (StringUtils.isEmpty(customerIds) || customerId == null) {
            return false;
        }
        String currentCustomerId = String.valueOf(customerId);
        return Arrays.stream(customerIds.split(","))
                .map(String::trim)
                .anyMatch(currentCustomerId::equals);
    }

    // 从联系人关联列表里移除当前客户ID，并保持逗号拼接格式。
    private String removeCustomerId(String customerIds, Long customerId) {
        if (StringUtils.isEmpty(customerIds) || customerId == null) {
            return customerIds;
        }
        String currentCustomerId = String.valueOf(customerId);
        return Arrays.stream(customerIds.split(","))
                .map(String::trim)
                .filter(StringUtils::isNotEmpty)
                .filter(id -> !currentCustomerId.equals(id))
                .distinct()
                .collect(Collectors.joining(","));
    }

    // 生成联系人业务唯一键，用于对本次提交数据去重比对。
    private String buildContactKey(CustomerContact contact) {
        return StringUtils.defaultString(contact.getContactPerson()) + "_" + StringUtils.defaultString(contact.getContactPhone());
    }

    // 更新内存中的联系人快照，避免后续增删判断使用旧数据。
    private void replaceLocalContact(List<CustomerContact> customerContacts, CustomerContact targetContact) {
        for (int i = 0; i < customerContacts.size(); i++) {
            CustomerContact customerContact = customerContacts.get(i);
            if (Objects.equals(customerContact.getId(), targetContact.getId())) {
                customerContacts.set(i, targetContact);
                return;
            }
        }
    }

    /**

 src/main/java/com/ruoyi/basic/vo/CustomerVo.java

@@ -1,5 +1,6 @@
package com.ruoyi.basic.vo;

import com.ruoyi.basic.dto.CustomerContactDto;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.pojo.Customer;
import io.swagger.annotations.ApiModelProperty;
@@ -9,20 +10,23 @@

@Data
public class CustomerVo extends Customer {
    @ApiModelProperty(value = "跟进记录")
    @ApiModelProperty(value = "璺熻繘璁板綍")
    private List<CustomerFollowUpDto> followUpList;

    @ApiModelProperty(value = "鑱旂郴浜轰俊鎭?")
    private List<CustomerContactDto> contactList;

    private String usageUserName;

    private String togetherUserNames;

    /**
     * 共享用户ID列表
     * 鍏变韩鐢ㄦ埛ID鍒楄〃
     */
    private List<Long> userIds;

    /**
     * 共享用户ID字符串（SQL查询返回，用于转换为List）
     * 鍏变韩鐢ㄦ埛ID瀛楃涓诧紙SQL鏌ヨ杩斿洖锛岀敤浜庤浆鎹负List锛?
     */
    private String userIdsStr;
}

 src/main/resources/mapper/basic/CustomerMapper.xml

@@ -8,7 +8,30 @@
    </resultMap>
    <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
        select
        c.*,
        c.id,
        c.customer_name,
        c.customer_type,
        c.taxpayer_identification_number,
        c.company_address,
        c.company_phone,
        (
        select group_concat(cc.contact_person separator ',')
        from customer_contact cc
        where find_in_set(c.id, cc.customer_id)
        ) as contact_person,
        (
        select group_concat(cc.contact_phone separator ',')
        from customer_contact cc
        where find_in_set(c.id, cc.customer_id)
        ) as contact_phone,
        c.maintainer,
        c.maintenance_time,
        c.tenant_id,
        c.type,
        c.is_assigned,
        c.usage_user,
        c.basic_bank_account,
        c.bank_account,
        u.user_name usage_user_name,
        (
        select group_concat(u2.user_name separator ', ')
@@ -57,6 +80,16 @@
    <select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
        select
        c.*,
        (
        select group_concat(cc.contact_person separator ',')
        from customer_contact cc
        where find_in_set(c.id, cc.customer_id)
        ) as contact_person,
        (
        select group_concat(cc.contact_phone separator ',')
        from customer_contact cc
        where find_in_set(c.id, cc.customer_id)
        ) as contact_phone,
        u.user_name usage_user_name,
        (
        select group_concat(u2.user_name separator ', ')
@@ -107,4 +140,4 @@
            </if>
        </where>
    </select>
</mapper>
</mapper>