lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

08-20-修改删除供应商时，更新文件

Browse Source
This commit is contained in:
青云
2025-08-20 10:56:17 +08:00
parent 5596631979
commit bd382a71bb
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java
View File

@ -39,9 +39,6 @@ public class TenderSupplierInputController extends BaseController {
private final ITenderSupplierInputService tenderSupplierInputService; private final ITenderSupplierInputService tenderSupplierInputService;
@Autowired
private ISysOssService ossService;
/** /**
* 查询供应商入库列表 * 查询供应商入库列表
*/ */
@ -70,7 +67,7 @@ public class TenderSupplierInputController extends BaseController {
@SaCheckPermission("supplierInput:supplierInput:query") @SaCheckPermission("supplierInput:supplierInput:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<TenderSupplierInputVo> getInfo(@NotNull(message = "主键不能为空") public R<TenderSupplierInputVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) { @PathVariable Long id) {
return R.ok(tenderSupplierInputService.queryById(id)); return R.ok(tenderSupplierInputService.queryById(id));
} }
@ -93,7 +90,7 @@ public class TenderSupplierInputController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(TenderSupplierInputBo bo,@RequestPart("file") MultipartFile file) { public R<Void> edit(TenderSupplierInputBo bo,@RequestPart("file") MultipartFile file) {
return toAjax(tenderSupplierInputService.updateByBo(bo)); return toAjax(tenderSupplierInputService.updateByBo(bo,file));
} }
/** /**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java
View File

@ -32,6 +32,11 @@ public class TenderSupplierInput extends BaseEntity {
*/ */
private String supplierType; private String supplierType;
/***
* 资料文件ID
*/
private Long fileId;
/** /**
* 入库资料 * 入库资料
*/ */

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java
View File

@ -59,7 +59,7 @@ public interface ITenderSupplierInputService extends IService<TenderSupplierInpu
* @param bo 供应商入库 * @param bo 供应商入库
* @return 是否修改成功 * @return 是否修改成功
*/ */
Boolean updateByBo(TenderSupplierInputBo bo); Boolean updateByBo(TenderSupplierInputBo bo,MultipartFile file);
/** /**
* 校验并批量删除供应商入库信息 * 校验并批量删除供应商入库信息

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java
View File

@ -21,6 +21,7 @@ import org.dromara.tender.mapper.TenderSupplierInputMapper;
import org.dromara.tender.service.ITenderSupplierInputService; import org.dromara.tender.service.ITenderSupplierInputService;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection; import java.util.Collection;
@ -98,6 +99,7 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
TenderSupplierInput add = MapstructUtils.convert(bo, TenderSupplierInput.class); TenderSupplierInput add = MapstructUtils.convert(bo, TenderSupplierInput.class);
SysOssUploadVo sysOssUploadVo = ossService.uploadWithNoSave(file, ossService.minioFileName(SupplierInput, file)); SysOssUploadVo sysOssUploadVo = ossService.uploadWithNoSave(file, ossService.minioFileName(SupplierInput, file));
add.setInputFile(sysOssUploadVo.getUrl()); add.setInputFile(sysOssUploadVo.getUrl());
add.setFileId(Long.valueOf(sysOssUploadVo.getOssId()));
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
@ -113,8 +115,14 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
* @return 是否修改成功 * @return 是否修改成功
*/ */
@Override @Override
public Boolean updateByBo(TenderSupplierInputBo bo) { public Boolean updateByBo(TenderSupplierInputBo bo,MultipartFile file) {
TenderSupplierInput update = MapstructUtils.convert(bo, TenderSupplierInput.class); 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); validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
@ -137,6 +145,14 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){ if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验 //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; return baseMapper.deleteByIds(ids) > 0;
} }