From 2b382a92207dfabf0eb30e743265df5c7c50e7bc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:27:45 +0800
Subject: [PATCH] feat(approve): 新增办公用品审批功能
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 267 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 185 insertions(+), 82 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 58810c9..52d01ec 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,8 +1,6 @@
package com.ruoyi.basic.service.impl;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,27 +13,25 @@
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.CustomerUser;
+import com.ruoyi.basic.service.*;
+import com.ruoyi.basic.vo.CustomerVo;
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.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -51,14 +47,19 @@
@AllArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
- private final SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
private CustomerMapper customerMapper;
+ @Autowired
private CustomerFollowUpService customerFollowUpService;
-
+ @Autowired
private CustomerFollowUpFileService customerFollowUpFileService;
-
+ @Autowired
private CustomerReturnVisitService customerReturnVisitService;
+ @Autowired
+ private CustomerUserService customerUserService;
/**
* 鏌ヨ瀹㈡埛妗ｆ
@@ -78,14 +79,9 @@
* @return 瀹㈡埛璇︽儏DTO
*/
@Override
- public CustomerDto selectCustomerDetailById(Long id) {
- Customer customer = customerMapper.selectById(id);
- if (customer == null) {
- return null;
- }
-
- CustomerDto dto = new CustomerDto();
- BeanUtils.copyProperties(customer, dto);
+ public CustomerVo selectCustomerDetailById(Long id) {
+ CustomerVo customerVo = new CustomerVo();
+ BeanUtils.copyProperties(this.getById(id), customerVo);
// 鏌ヨ璺熻繘璁板綍
List<CustomerFollowUp> followUpList = customerFollowUpService.list(
@@ -93,8 +89,7 @@
.eq(CustomerFollowUp::getCustomerId, id)
.orderByDesc(CustomerFollowUp::getFollowUpTime)
);
-
- if (!CollectionUtils.isEmpty(followUpList)) {
+ if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(followUpList)) {
List<CustomerFollowUpDto> followUpDtoList = followUpList.stream().map(followUp -> {
CustomerFollowUpDto followUpDto = new CustomerFollowUpDto();
BeanUtils.copyProperties(followUp, followUpDto);
@@ -109,10 +104,10 @@
return followUpDto;
}).collect(Collectors.toList());
- dto.setFollowUpList(followUpDtoList);
+ customerVo.setFollowUpList(followUpDtoList);
}
- return dto;
+ return customerVo;
}
/**
@@ -122,62 +117,65 @@
* @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<CustomerVo> selectCustomerList(Page<CustomerDto> page, CustomerDto customer) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long loginUserId = loginUser.getUserId();
+ IPage<CustomerVo> customerPage = customerMapper.listPage(page, customer, loginUserId);
+
+ List<CustomerVo> records = customerPage.getRecords();
+ if (CollectionUtils.isEmpty(records)) {
+ return customerPage;
}
- // 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
- LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
- String customerName = customer.getCustomerName();
- String customerType = customer.getCustomerType();
- if (StringUtils.isNotBlank(customerName)) {
- queryWrapper.like(Customer::getCustomerName, customerName);
- }
- if (StringUtils.isNotBlank(customerType)) {
- queryWrapper.like(Customer::getCustomerType, customerType);
- }
-
- // 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
- IPage<Customer> customerPage = customerMapper.selectPage(page, queryWrapper);
-
- // 4. 鏁版嵁澶勭悊锛堝寮虹┖鍊煎畨鍏� & 浠ｇ爜鍙鎬э級
- List<Customer> processedList = customerPage.getRecords().stream()
- .filter(Objects::nonNull) // 杩囨护绌哄璞★紙閬垮厤鍚庣画鎿嶄綔NPE锛�
- .peek(c -> {
- // 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
- String address = StringUtils.defaultString(c.getCompanyAddress(), "");
- String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
- c.setAddressPhone(address + "(" + phone + ")");
-
- // 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
- 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(
- Date.from(
- followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
- )
- );
- }
- })
+ List<Long> customerIds = records.stream()
+ .map(CustomerVo::getId)
+ .filter(Objects::nonNull)
.collect(Collectors.toList());
- // 5. 鏇存柊鍒嗛〉缁撴灉涓殑鏁版嵁锛堜繚鎸佸垎椤典俊鎭畬鏁达級
- IPage<Customer> resultPage = new Page<>(customerPage.getCurrent(), customerPage.getSize(), customerPage.getTotal());
- resultPage.setRecords(processedList);
+ if (!CollectionUtils.isEmpty(customerIds)) {
+ Map<Long, CustomerFollowUp> latestFollowUpMap = getLatestFollowUpMap(customerIds);
- return customerPage; // 杩斿洖鍖呭惈鍒嗛〉淇℃伅鐨処Page瀵硅薄
+ 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()
+ ));
+ }
+
+ // 杞崲鍏变韩鐢ㄦ埛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);
+ }
+ });
+ }
+
+ return customerPage;
+ }
+
+ private Map<Long, CustomerFollowUp> getLatestFollowUpMap(List<Long> customerIds) {
+ List<CustomerFollowUp> followUps = customerFollowUpService.list(
+ new LambdaQueryWrapper<CustomerFollowUp>()
+ .in(CustomerFollowUp::getCustomerId, customerIds)
+ .orderByDesc(CustomerFollowUp::getFollowUpTime)
+ );
+
+ return followUps.stream()
+ .collect(Collectors.toMap(
+ CustomerFollowUp::getCustomerId,
+ followUp -> followUp,
+ (existing, replacement) -> existing
+ ));
}
/**
@@ -222,12 +220,28 @@
if (!salesLedgers.isEmpty()) {
throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁閿�鍞悎鍚岋紝璇峰厛鍒犻櫎閿�鍞悎鍚�");
}
- // 鍒犻櫎瀹㈡埛鐨勫悓鏃朵篃闇�瑕佸垹闄ゅ搴旂殑瀹㈡埛璺熼殢銆侀檮浠跺拰鍥炶鎻愰啋
+ // 鏌ヨ鏄惁鏈夊凡鍒嗛厤鐨勫叕娴峰鎴�
+ List<Customer> assignedPools = customerMapper.selectList(
+ new QueryWrapper<Customer>().lambda()
+ .in(Customer::getId, idList)
+ .eq(Customer::getType, 1).
+ eq(Customer::getIsAssigned, 1) // 鍏捣瀹㈡埛
+ );
+ if (!assignedPools.isEmpty()) {
+ throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁宸插垎閰嶇殑鍏捣瀹㈡埛锛岃鍏堟敹鍥�");
+ }
+ // 鍒犻櫎瀹㈡埛鐨勫悓鏃朵篃闇�瑕佸垹闄ゅ搴旂殑瀹㈡埛璺熼殢銆侀檮浠跺拰鍥炶鎻愰啋
for (Long id : ids) {
customerFollowUpService.deleteByCustomerId(id);
customerReturnVisitService.deleteByCustomerId(id);
+ // 鍒犻櫎瀹㈡埛鐨勫叡浜叧绯�
+ customerUserService.remove(
+ new QueryWrapper<CustomerUser>().lambda()
+ .eq(CustomerUser::getCustomerId, id)
+ );
}
+ // 鍒犻櫎瀹㈡埛涓昏〃鏁版嵁
return customerMapper.deleteBatchIds(idList);
}
@@ -239,23 +253,32 @@
}
@Override
- public List<Customer> selectCustomerLists(Customer customer) {
- return customerMapper.selectList(null);
+ public List<CustomerVo> selectCustomerLists(CustomerDto customer) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long loginUserId = loginUser.getUserId();
+ return customerMapper.list(customer, loginUserId);
}
@Override
- public AjaxResult importData(MultipartFile file) {
+ public R importData(MultipartFile file, Integer type) {
try {
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
List<Customer> userList = util.importExcel(file.getInputStream());
if (CollectionUtils.isEmpty(userList)) {
- return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return R.fail("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ }
+
+ // 鏍规嵁 type 鍙傛暟璁剧疆瀹㈡埛绫诲瀷锛堢娴�/鍏捣锛�
+ if (type != null) {
+ userList.forEach(customer -> {
+ customer.setType(type);
+ });
}
this.saveOrUpdateBatch(userList);
- return AjaxResult.success(true);
+ return R.ok(true);
} catch (Exception e) {
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
}
@@ -276,6 +299,86 @@
).collect(Collectors.toList());
}
+ // 鍒嗛厤鍏捣瀹㈡埛缁欑娴�
+ @Override
+ public void assignCustomer(CustomerDto customerDto) {
+ Customer customer = customerMapper.selectById(customerDto.getId());
+ if (customer.getType() == 1 && customer.getIsAssigned() == 0) { // 鍏捣涓斿彲鍒嗛厤
+ customer.setIsAssigned(1);
+ customer.setUsageStatus(1L);
+ customer.setUsageUser(customerDto.getUsageUser());
+ customerMapper.updateById(customer);
+ }
+ }
+
+ // 鍥炴敹绉佹捣瀹㈡埛鍒板叕娴�
+ @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(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);
+ }
+
+ @Override
+ public Boolean back(Long id) {
+ //灏嗗鎴风殑type鏀逛负1 涓旂洿鎺ュ垎閰嶇粰褰撳墠鐢ㄦ埛
+ Customer customer = customerMapper.selectById(id);
+ customer.setType(1);
+ customer.setIsAssigned(1);
+ return this.updateById(customer);
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
--
Gitblit v1.9.3