gongchunyi
2026-04-28 cb3bc6d91595409e138daf6fe08a661bba9d25ee
feat: 客户拜访编辑时清除已删除的文件
已修改3个文件
54 ■■■■ 文件已修改
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.customervisits.dto.CustomerVisitsDto;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.customervisits.service.impl.CustomerVisitsServiceImpl;
@@ -66,12 +65,8 @@
    @ApiOperation("客户拜访-编辑")
    @PostMapping("update")
    public AjaxResult updateCustomerVisit(@RequestBody CustomerVisitsDto customerVisitsDto) throws Exception{
        CustomerVisits customerVisits = new CustomerVisits();
        BeanUtils.copyProperties(customerVisitsDto,customerVisits);
        boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
        boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisitsDto);
        if (updateResult) {
            // 附件绑定
            tempFileService.migrateTempFilesToFormal(customerVisits.getId().longValue(), customerVisitsDto.getTempFileIds(), FileNameType.CUSTOMER_VISITS.getValue());
            return AjaxResult.success("编辑成功");
        }
        return AjaxResult.error("编辑失败");
src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.customervisits.dto.CustomerVisitsDto;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.framework.web.domain.AjaxResult;
/**
 * @author :yys
@@ -16,4 +15,6 @@
    boolean updateCustomerVisit(CustomerVisits customerVisits);
    boolean updateCustomerVisit(CustomerVisitsDto customerVisitsDto) throws Exception;
}
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -10,15 +10,21 @@
import com.ruoyi.customervisits.mapper.CustomerVisitsMapper;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.customervisits.service.CustomerVisitsService;
import com.ruoyi.quality.pojo.QualityUnqualified;
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
@@ -33,6 +39,9 @@
    @Autowired
    private CommonFileMapper commonFileMapper;
    @Autowired
    private TempFileServiceImpl tempFileService;
    @Override
    public IPage<CustomerVisitsDto> listPage(Page page, CustomerVisits customerVisits) {
@@ -62,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;
    }
}