From bd382a71bb96de302f89f3a0ec1e6a16338e6d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Wed, 20 Aug 2025 10:56:17 +0800
Subject: [PATCH] =?UTF-8?q?08-20-=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TenderSupplierInputController.java         |  7 ++-----
 .../tender/domain/TenderSupplierInput.java     |  5 +++++
 .../service/ITenderSupplierInputService.java   |  2 +-
 .../impl/TenderSupplierInputServiceImpl.java   | 18 +++++++++++++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java
index c17398bc..5b0b330e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java
@@ -39,9 +39,6 @@ public class TenderSupplierInputController extends BaseController {
 
     private final ITenderSupplierInputService tenderSupplierInputService;
 
-    @Autowired
-    private ISysOssService ossService;
-
     /**
      * 查询供应商入库列表
      */
@@ -70,7 +67,7 @@ public class TenderSupplierInputController extends BaseController {
     @SaCheckPermission("supplierInput:supplierInput:query")
     @GetMapping("/{id}")
     public R<TenderSupplierInputVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                            @PathVariable Long id) {
         return R.ok(tenderSupplierInputService.queryById(id));
     }
 
@@ -93,7 +90,7 @@ public class TenderSupplierInputController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(TenderSupplierInputBo bo,@RequestPart("file") MultipartFile file) {
-        return toAjax(tenderSupplierInputService.updateByBo(bo));
+        return toAjax(tenderSupplierInputService.updateByBo(bo,file));
     }
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java
index f1e59980..8a6f9b71 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java
@@ -32,6 +32,11 @@ public class TenderSupplierInput extends BaseEntity {
      */
     private String supplierType;
 
+    /***
+     * 资料文件ID
+     */
+    private Long fileId;
+
     /**
      * 入库资料
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java
index 3647cff8..15eb8ad5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java
@@ -59,7 +59,7 @@ public interface ITenderSupplierInputService extends IService<TenderSupplierInpu
      * @param bo 供应商入库
      * @return 是否修改成功
      */
-    Boolean updateByBo(TenderSupplierInputBo bo);
+    Boolean updateByBo(TenderSupplierInputBo bo,MultipartFile file);
 
     /**
      * 校验并批量删除供应商入库信息
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java
index b8783910..ee0ea9d1 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java
@@ -21,6 +21,7 @@ import org.dromara.tender.mapper.TenderSupplierInputMapper;
 import org.dromara.tender.service.ITenderSupplierInputService;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -98,6 +99,7 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
         TenderSupplierInput add = MapstructUtils.convert(bo, TenderSupplierInput.class);
         SysOssUploadVo sysOssUploadVo = ossService.uploadWithNoSave(file, ossService.minioFileName(SupplierInput, file));
         add.setInputFile(sysOssUploadVo.getUrl());
+        add.setFileId(Long.valueOf(sysOssUploadVo.getOssId()));
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
@@ -113,8 +115,14 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
      * @return 是否修改成功
      */
     @Override
-    public Boolean updateByBo(TenderSupplierInputBo bo) {
+    public Boolean updateByBo(TenderSupplierInputBo bo,MultipartFile file) {
         TenderSupplierInput update = MapstructUtils.convert(bo, TenderSupplierInput.class);
+        TenderSupplierInput byId = getById(update.getId());
+        ossService.deleteWithValidByIds(List.of(byId.getFileId()), false);
+
+        SysOssUploadVo sysOssUploadVo = ossService.uploadWithNoSave(file, ossService.minioFileName(SupplierInput, file));
+        update.setInputFile(sysOssUploadVo.getUrl());
+        update.setFileId(Long.valueOf(sysOssUploadVo.getOssId()));
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
@@ -137,6 +145,14 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
+            List<Long> fileIds = new ArrayList<>();
+            for (Long id : ids) {
+                TenderSupplierInput byId = getById(id);
+                if (byId.getFileId() != null){
+                    fileIds.add(byId.getFileId());
+                }
+            }
+            ossService.deleteWithValidByIds(fileIds, false);
         }
         return baseMapper.deleteByIds(ids) > 0;
     }