From 8c8ff31cdca25f579d3c1f688f46c877bf28aaa1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:21:46 +0800
Subject: [PATCH] feat(approve): 重构审批流程配置功能
---
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
index 319d478..aef8802 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -4,14 +4,27 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.customervisits.dto.CustomerVisitsDto;
import com.ruoyi.customervisits.mapper.CustomerVisitsMapper;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.customervisits.service.CustomerVisitsService;
+import com.ruoyi.other.service.impl.TempFileServiceImpl;
+import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.pojo.CommonFile;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -24,14 +37,22 @@
@Autowired
private CustomerVisitsMapper customerVisitsMapper;
+ @Autowired
+ private CommonFileMapper commonFileMapper;
+
+ @Autowired
+ private TempFileServiceImpl tempFileService;
+
@Override
- public IPage<CustomerVisits> listPage(Page page, CustomerVisits customerVisits) {
- LambdaQueryWrapper<CustomerVisits> customerVisitsLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if (customerVisits != null && !StringUtils.isEmpty(customerVisits.getCustomerName())) {
- customerVisitsLambdaQueryWrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
+ public IPage<CustomerVisitsDto> listPage(Page page, CustomerVisits customerVisits) {
+ IPage<CustomerVisitsDto> selectPage = customerVisitsMapper.listPage(page, customerVisits);
+ for (CustomerVisitsDto record : selectPage.getRecords()) {
+ List<CommonFile> allFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, record.getId())
+ .eq(CommonFile::getType, FileNameType.CUSTOMER_VISITS.getValue()));
+ record.setCommonFileList(allFiles);
}
- Page page1 = customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
- return page1;
+ return selectPage;
}
@Override
@@ -50,4 +71,37 @@
return updateById(customerVisits);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateCustomerVisit(CustomerVisitsDto customerVisitsDto) throws Exception {
+ CustomerVisits customerVisits = new CustomerVisits();
+ BeanUtils.copyProperties(customerVisitsDto, customerVisits);
+ boolean updateResult = updateCustomerVisit(customerVisits);
+ if (!updateResult) {
+ return false;
+ }
+
+ Long businessId = customerVisits.getId().longValue();
+ List<CommonFile> existingFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, businessId)
+ .eq(CommonFile::getType, FileNameType.CUSTOMER_VISITS.getValue()));
+ Set<Long> retainedFileIds = customerVisitsDto.getCommonFileList() == null
+ ? Collections.emptySet()
+ : customerVisitsDto.getCommonFileList().stream()
+ .map(CommonFile::getId)
+ .filter(java.util.Objects::nonNull)
+ .collect(Collectors.toSet());
+ for (CommonFile commonFile : existingFiles) {
+ if (commonFile.getId() == null || retainedFileIds.contains(commonFile.getId())) {
+ continue;
+ }
+ if (commonFile.getUrl() != null && !commonFile.getUrl().isEmpty()) {
+ Files.deleteIfExists(Paths.get(commonFile.getUrl()));
+ }
+ commonFileMapper.deleteById(commonFile.getId());
+ }
+ tempFileService.migrateTempFilesToFormal(businessId, customerVisitsDto.getTempFileIds(), FileNameType.CUSTOMER_VISITS.getValue());
+ return true;
+ }
}
--
Gitblit v1.9.3