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 | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 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 c30f4f8..52d01ec 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -10,32 +10,28 @@
import com.ruoyi.basic.dto.CustomerDto;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.mapper.CustomerMapper;
-import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;
-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.pojo.Customer;
+import com.ruoyi.basic.pojo.CustomerFollowUp;
+import com.ruoyi.basic.pojo.CustomerFollowUpFile;
+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.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
-import lombok.RequiredArgsConstructor;
+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.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,16 +44,21 @@
* @date 2025-05-07
*/
@Service
-@RequiredArgsConstructor
+@AllArgsConstructor
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
- private final SalesLedgerMapper salesLedgerMapper;
- private final CustomerPrivatePoolMapper customerPrivatePoolMapper;
- private final CustomerMapper customerMapper;
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private CustomerMapper customerMapper;
- private final CustomerFollowUpService customerFollowUpService;
- private final CustomerReturnVisitService customerReturnVisitService;
-
+ @Autowired
+ private CustomerFollowUpService customerFollowUpService;
+ @Autowired
+ private CustomerFollowUpFileService customerFollowUpFileService;
+ @Autowired
+ private CustomerReturnVisitService customerReturnVisitService;
+ @Autowired
private CustomerUserService customerUserService;
/**
@@ -165,13 +166,13 @@
private Map<Long, CustomerFollowUp> getLatestFollowUpMap(List<Long> customerIds) {
List<CustomerFollowUp> followUps = customerFollowUpService.list(
new LambdaQueryWrapper<CustomerFollowUp>()
- .in(CustomerFollowUp::getCustomerPrivatePoolId, customerIds)
+ .in(CustomerFollowUp::getCustomerId, customerIds)
.orderByDesc(CustomerFollowUp::getFollowUpTime)
);
return followUps.stream()
.collect(Collectors.toMap(
- CustomerFollowUp::getCustomerPrivatePoolId,
+ CustomerFollowUp::getCustomerId,
followUp -> followUp,
(existing, replacement) -> existing
));
@@ -229,13 +230,18 @@
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)
+ );
}
- customerMapper.delete(new QueryWrapper<Customer>().lambda().in(Customer::getId, idList));
+ // 鍒犻櫎瀹㈡埛涓昏〃鏁版嵁
return customerMapper.deleteBatchIds(idList);
}
@@ -247,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("瀵煎叆澶辫触");
}
}
@@ -355,6 +370,15 @@
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