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 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 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 0; if (flag) { @@ -113,8 +115,14 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl 0; } @@ -137,6 +145,14 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 + List 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; }