From cf99945deda3cba4b0e634abb100847f5cc2529b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:36:46 +0800
Subject: [PATCH] 优化共享客户以及列表查询
---
src/main/java/com/ruoyi/basic/dto/CustomerDto.java | 7 +
src/main/java/com/ruoyi/basic/mapper/CustomerUserMapper.java | 15 +++
src/main/java/com/ruoyi/basic/pojo/CustomerUser.java | 2
src/main/resources/mapper/basic/CustomerMapper.xml | 29 +++++-
src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java | 5
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 15 +++
src/main/java/com/ruoyi/basic/vo/CustomerVo.java | 14 +++
src/main/java/com/ruoyi/basic/service/impl/CustomerUserServiceImpl.java | 19 ++++
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 12 ++
src/main/java/com/ruoyi/basic/service/CustomerUserService.java | 13 +++
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 78 +++++++++++++++++--
11 files changed, 185 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index e2373e6..051976c 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -5,6 +5,7 @@
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.basic.vo.CustomerVo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -35,7 +36,7 @@
*/
@GetMapping("/list")
public R list(Page<CustomerDto> page, CustomerDto customer) {
- IPage<CustomerDto> customerDtoIPage = customerService.selectCustomerList(page, customer);
+ IPage<CustomerVo> customerDtoIPage = customerService.selectCustomerList(page, customer);
return R.ok(customerDtoIPage);
}
@@ -140,4 +141,14 @@
customerService.recycleCustomer(customer);
return AjaxResult.success();
}
-}
+
+ /**
+ * 鍏变韩瀹㈡埛
+ */
+ @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.OTHER)
+ @PostMapping("/together")
+ public AjaxResult together(@RequestBody CustomerDto customer) {
+ customerService.together(customer);
+ return AjaxResult.success();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/dto/CustomerDto.java b/src/main/java/com/ruoyi/basic/dto/CustomerDto.java
index d2790d2..d75de55 100644
--- a/src/main/java/com/ruoyi/basic/dto/CustomerDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/CustomerDto.java
@@ -24,4 +24,9 @@
private String usageUserName;
private String togetherUserNames;
-}
+
+ /**
+ * 鍏变韩鐢ㄦ埛ID鍒楄〃
+ */
+ private List<Long> userIds;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
index ac86398..b9e5725 100644
--- a/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/CustomerMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.vo.CustomerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -67,5 +68,5 @@
*/
int deleteCustomerByIds(Long[] ids);
- IPage<CustomerDto> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer);
-}
+ IPage<CustomerVo> listPage(Page<CustomerDto> page, @Param("c") CustomerDto customer, @Param("loginUserId") Long loginUserId);
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/mapper/CustomerUserMapper.java b/src/main/java/com/ruoyi/basic/mapper/CustomerUserMapper.java
new file mode 100644
index 0000000..84aebac
--- /dev/null
+++ b/src/main/java/com/ruoyi/basic/mapper/CustomerUserMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.basic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.basic.pojo.CustomerUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 瀹㈡埛鍏变韩Mapper鎺ュ彛
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @date 2026-04-29
+ */
+@Mapper
+public interface CustomerUserMapper extends BaseMapper<CustomerUser> {
+}
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerUser.java b/src/main/java/com/ruoyi/basic/pojo/CustomerUser.java
index 29da8ff..901b0ce 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerUser.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerUser.java
@@ -7,7 +7,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
-@TableName(value = "customer")
+@TableName(value = "customer_user")
@Data
public class CustomerUser implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/basic/service/CustomerUserService.java b/src/main/java/com/ruoyi/basic/service/CustomerUserService.java
new file mode 100644
index 0000000..eda5f8e
--- /dev/null
+++ b/src/main/java/com/ruoyi/basic/service/CustomerUserService.java
@@ -0,0 +1,13 @@
+package com.ruoyi.basic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.pojo.CustomerUser;
+
+/**
+ * 瀹㈡埛鍏变韩Service鎺ュ彛
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @date 2026-04-29
+ */
+public interface CustomerUserService extends IService<CustomerUser> {
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 3a300ea..2b4c887 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.CustomerDto;
-import com.ruoyi.basic.dto.CustomerPrivatePoolDto;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.vo.CustomerVo;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -80,9 +79,16 @@
AjaxResult importData(MultipartFile file);
- IPage<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
+ IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer);
void assignCustomer(CustomerDto customer);
void recycleCustomer(CustomerDto customer);
-}
+
+ /**
+ * 鍏变韩瀹㈡埛缁欏叾浠栫敤鎴�
+ *
+ * @param customerDto 瀹㈡埛DTO锛堝寘鍚鎴稩D鍜屽叡浜敤鎴稩D鍒楄〃锛�
+ */
+ void together(CustomerDto customerDto);
+}
\ No newline at end of file
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 959d906..c30f4f8 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -11,12 +11,11 @@
import com.ruoyi.basic.dto.CustomerFollowUpDto;
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.CustomerFollowUpFile;
-import com.ruoyi.basic.pojo.CustomerPrivatePool;
+import com.ruoyi.basic.pojo.*;
+import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.CustomerReturnVisitService;
+import com.ruoyi.basic.service.CustomerUserService;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.basic.vo.CustomerVo;
import com.ruoyi.common.utils.SecurityUtils;
@@ -58,6 +57,8 @@
private final CustomerFollowUpService customerFollowUpService;
private final CustomerReturnVisitService customerReturnVisitService;
+
+ private CustomerUserService customerUserService;
/**
* 鏌ヨ瀹㈡埛妗ｆ
@@ -115,16 +116,18 @@
* @return 瀹㈡埛妗ｆ
*/
@Override
- public IPage<CustomerDto> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
- IPage<CustomerDto> customerPage = customerMapper.listPage(page, customer);
+ public IPage<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long loginUserId = loginUser.getUserId();
+ IPage<CustomerVo> customerPage = customerMapper.listPage(page, customer, loginUserId);
- List<CustomerDto> records = customerPage.getRecords();
+ List<CustomerVo> records = customerPage.getRecords();
if (CollectionUtils.isEmpty(records)) {
return customerPage;
}
List<Long> customerIds = records.stream()
- .map(CustomerDto::getId)
+ .map(CustomerVo::getId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
@@ -142,6 +145,16 @@
c.setFollowUpTime(Date.from(
followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
));
+ }
+
+ // 杞崲鍏变韩鐢ㄦ埛ID瀛楃涓蹭负List<Long>
+ String userIdsStr = c.getUserIdsStr();
+ if (StringUtils.isNotEmpty(userIdsStr)) {
+ List<Long> userIds = Arrays.stream(userIdsStr.split(","))
+ .map(String::trim)
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ c.setUserIds(userIds);
}
});
}
@@ -285,16 +298,63 @@
// 鍥炴敹绉佹捣瀹㈡埛鍒板叕娴�
@Override
+ @Transactional(rollbackFor = Exception.class)
public void recycleCustomer(CustomerDto customerDto) {
Customer customer = customerMapper.selectById(customerDto.getId());
if (customer.getType() == 1 && customer.getIsAssigned() == 1) { // 鍏捣涓斿凡鍒嗛厤
customer.setIsAssigned(0);
customer.setUsageStatus(0L);
- customer.setUsageUser(null);
+ customer.setUsageUser(0L);
customerMapper.updateById(customer);
+
+ // 鍒犻櫎璇ュ鎴风殑鎵�鏈夊叡浜叧绯�
+ customerUserService.remove(
+ new QueryWrapper<CustomerUser>().lambda()
+ .eq(CustomerUser::getCustomerId, customerDto.getId())
+ );
}
}
+ // 瀹㈡埛鍏变韩
+ @Override
+ public void together(CustomerDto customerDto) {
+ // 鏌ヨ鐜版湁鐨勫叡浜褰�
+ List<CustomerUser> existingUsers = customerUserService.list(
+ new QueryWrapper<CustomerUser>().lambda().eq(CustomerUser::getCustomerId, customerDto.getId())
+ );
+
+ // 鑾峰彇宸插瓨鍦ㄧ殑鐢ㄦ埛ID鍒楄〃
+ List<Long> existingUserIds = existingUsers.stream()
+ .map(CustomerUser::getUserId)
+ .collect(Collectors.toList());
+
+ // 杩囨护鎺夊凡瀛樺湪鐨勭敤鎴凤紝鍙繚鐣欐柊鐢ㄦ埛
+ List<Long> newUserIds = customerDto.getUserIds().stream()
+ .filter(userId -> !existingUserIds.contains(userId))
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isEmpty(newUserIds)) {
+ return;
+ }
+
+ // 鑾峰彇褰撳墠绉熸埛ID
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long tenantId = loginUser.getTenantId();
+
+ // 鎵归噺淇濆瓨鏂扮殑鍏变韩璁板綍
+ List<CustomerUser> customerUsers = newUserIds.stream()
+ .map(userId -> {
+ CustomerUser customerUser = new CustomerUser();
+ customerUser.setCustomerId(customerDto.getId());
+ customerUser.setUserId(userId);
+ customerUser.setTenantId(tenantId);
+ return customerUser;
+ })
+ .collect(Collectors.toList());
+
+ customerUserService.saveBatch(customerUsers);
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerUserServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerUserServiceImpl.java
new file mode 100644
index 0000000..5829e8a
--- /dev/null
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerUserServiceImpl.java
@@ -0,0 +1,19 @@
+package com.ruoyi.basic.service.impl;
+
+import com.ruoyi.basic.mapper.CustomerUserMapper;
+import com.ruoyi.basic.pojo.CustomerUser;
+import com.ruoyi.basic.service.CustomerUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 瀹㈡埛鍏变韩Service瀹炵幇绫�
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @date 2026-04-29
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CustomerUserServiceImpl extends ServiceImpl<CustomerUserMapper, CustomerUser> implements CustomerUserService {
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/vo/CustomerVo.java b/src/main/java/com/ruoyi/basic/vo/CustomerVo.java
index bb97a39..3d4c8cb 100644
--- a/src/main/java/com/ruoyi/basic/vo/CustomerVo.java
+++ b/src/main/java/com/ruoyi/basic/vo/CustomerVo.java
@@ -11,4 +11,18 @@
public class CustomerVo extends Customer {
@ApiModelProperty(value = "璺熻繘璁板綍")
private List<CustomerFollowUpDto> followUpList;
+
+ private String usageUserName;
+
+ private String togetherUserNames;
+
+ /**
+ * 鍏变韩鐢ㄦ埛ID鍒楄〃
+ */
+ private List<Long> userIds;
+
+ /**
+ * 鍏变韩鐢ㄦ埛ID瀛楃涓诧紙SQL鏌ヨ杩斿洖锛岀敤浜庤浆鎹负List锛�
+ */
+ private String userIdsStr;
}
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 1e7df5c..982f70f 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.Customer">
<id column="id" property="id" />
</resultMap>
- <select id="listPage" resultType="com.ruoyi.basic.dto.CustomerDto">
+ <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
select
c.*,
u.user_name usage_user_name,
@@ -16,7 +16,13 @@
left join sys_user u2 on cu.user_id = u2.user_id
where cu.customer_id = c.id
and cu.user_id != c.usage_user
- ) as together_user_names
+ ) as together_user_names,
+ (
+ select group_concat(cu.user_id separator ',')
+ from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as user_ids_str
from customer c
left join sys_user u on c.usage_user = u.user_id
<where>
@@ -26,14 +32,25 @@
<if test="c.customerType != null and c.customerType != ''">
and customer_type = #{c.customerType}
</if>
- <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰� -->
- <if test="c.type != null and c.type == 0">
- and type = #{c.type} or (type = 1 and is_assigned = 1)
- </if>
<!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
<if test="c.type != null and c.type == 1">
and type = #{c.type}
</if>
+ <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
+ <if test="c.type != null and c.type == 0">
+ and (
+ (type = #{c.type} or (type = 1 and is_assigned = 1))
+ and (
+ c.usage_user = #{loginUserId}
+ or c.create_user = #{loginUserId}
+ or exists (
+ select 1 from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id = #{loginUserId}
+ )
+ )
+ )
+ </if>
</where>
</select>
--
Gitblit v1.9.3