From b06a2928f34758ccef05650108e2b02d03962a63 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 12 十二月 2025 14:09:36 +0800
Subject: [PATCH] yys 商机管理

---
 src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
index 464810e..ba680d8 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.sales.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.other.mapper.TempFileMapper;
@@ -39,14 +40,26 @@
     @Value("${file.upload-dir}")
     private String uploadDir;
 
+    public List<CommonFile> getFileList(Long id,Integer type) {
+        LambdaQueryWrapper<CommonFile> commonFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        commonFileLambdaQueryWrapper.eq(CommonFile::getCommonId, id)
+                .eq(CommonFile::getType, type);
+        return list(commonFileLambdaQueryWrapper);
+    }
+
 
     @Override
     public int deleteSalesLedgerByIds(Long[] ids) {
+       for (Long id : ids) {
+           if (id == null) {
+               return 1;
+           }
+       }
         return commonFileMapper.deleteBatchIds(Arrays.asList(ids));
     }
 
     @Override
-    public CommonFile uploadFile(MultipartFile file, Long id, String type) throws IOException {
+    public CommonFile uploadFile(MultipartFile file, Long id, Integer type) throws IOException {
         // 1. 鐢熸垚姝e紡鏂囦欢ID鍜岃矾寰�
         String tempId = UUID.randomUUID().toString();
         Path tempFilePath = Paths.get(uploadDir, tempId + "_" + file.getOriginalFilename());
@@ -117,13 +130,9 @@
             Path formalFilePath = formalDirPath.resolve(formalFilename);
 
             try {
-                // 鎵ц鏂囦欢杩佺Щ锛堜娇鐢ㄥ師瀛愭搷浣滅‘淇濆畨鍏ㄦ�э級
-                Files.move(
-                        Paths.get(tempFile.getTempPath()),
-                        formalFilePath,
-                        StandardCopyOption.REPLACE_EXISTING,
-                        StandardCopyOption.ATOMIC_MOVE
-                );
+                // 鍘熷瓙绉诲姩澶辫触锛屼娇鐢ㄥ鍒�+鍒犻櫎
+                Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);
+                Files.deleteIfExists(Paths.get(tempFile.getTempPath()));
                 log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
 
                 // 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛�
@@ -134,6 +143,7 @@
                 fileRecord.setCreateTime(LocalDateTime.now());
                 fileRecord.setType(tempFile.getType());
                 commonFileMapper.insert(fileRecord);
+                tempFileMapper.deleteById(tempFileId);
 
                 log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
             } catch (IOException e) {

--
Gitblit v1.9.3