diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java index 92e79f81..75d56c9f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmFileInfoMapper.java @@ -56,4 +56,13 @@ public interface BmFileInfoMapper { * @return 结果 */ int deleteBmFileInfoByIds(Long[] ids); + + + /** + * 删除附件 + * + * @param bmFileInfo 附件信息 + * @return 结果 + */ + int deleteBmFileInfoByBizInfo(BmFileInfo bmFileInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java index 8d65c331..dc7cf0b4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java @@ -110,7 +110,7 @@ public class SupplierInfoController extends BaseController { @PutMapping public AjaxResult edit(@RequestBody SupplierInfo supplierInfo) { try { - return toAjax(supplierInfoService.updateSupplierInfo(supplierInfo)); + return supplierInfoService.updateSupplierInfo(supplierInfo); } catch (Exception e) { return error("系统错误, " + e.getMessage()); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ISupplierInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ISupplierInfoService.java index 61b02eb3..bb402f44 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ISupplierInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ISupplierInfoService.java @@ -41,7 +41,7 @@ public interface ISupplierInfoService { * @param supplierInfo 物资厂家管理 * @return 结果 */ - int updateSupplierInfo(SupplierInfo supplierInfo); + AjaxResult updateSupplierInfo(SupplierInfo supplierInfo); /** * 批量删除物资厂家管理 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java index 7088ab17..28f4c226 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java @@ -82,6 +82,7 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { AtomicBoolean addFileInfoResult = new AtomicBoolean(false); supplierInfo.getBmFileInfos().forEach(bmFileInfo -> { bmFileInfo.setModelId(supplierInfo.getSupplierId()); + bmFileInfo.setCreateTime(DateUtils.getNowDate()); addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0); }); return addFileInfoResult.get() ? AjaxResult.success("新增任务成功") : AjaxResult.error("新增任务失败,附件表插入0条"); @@ -91,20 +92,6 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { } catch (Exception e) { throw new ServiceException("数据库错误或供应商名称重复"); } - -// if (insertedSupplierInfoResult > 0 && ArrayUtil.isNotEmpty(supplierInfo.getFiles())) { -// AjaxResult uploadedFilesResult = remoteFileService.uploadFile(supplierInfo.getFiles()); -// if (uploadedFilesResult.isSuccess()) { -// Object uploadFilesResultData = uploadedFilesResult.get("data"); -// if (uploadFilesResultData != null) { -// if (uploadFilesResultData instanceof List) { -// -// } -// } -// } else { -// return AjaxResult.error("新增任务失败,文件上传失败:" + uploadedFilesResult.get("msg")); -// } -// } } /** @@ -114,10 +101,25 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { * @return 结果 */ @Override - public int updateSupplierInfo(SupplierInfo supplierInfo) { + public AjaxResult updateSupplierInfo(SupplierInfo supplierInfo) { supplierInfo.setUpdateTime(DateUtils.getNowDate()); try { - return supplierInfoMapper.updateSupplierInfo(supplierInfo); + int updatedSupplierInfoResult = supplierInfoMapper.updateSupplierInfo(supplierInfo); + if (updatedSupplierInfoResult > 0) { + if (CollectionUtils.isEmpty(supplierInfo.getBmFileInfos())) { + return AjaxResult.success("修改任务成功,无营业执照附件"); + } + bmFileInfoMapper.deleteBmFileInfoByBizInfo(supplierInfo.getBmFileInfos().get(0)); + AtomicBoolean addFileInfoResult = new AtomicBoolean(false); + supplierInfo.getBmFileInfos().forEach(bmFileInfo -> { + bmFileInfo.setModelId(supplierInfo.getSupplierId()); + bmFileInfo.setCreateTime(DateUtils.getNowDate()); + addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0); + }); + return addFileInfoResult.get() ? AjaxResult.success("修改任务成功") : AjaxResult.error("修改任务失败,附件表插入0条"); + } else { + return AjaxResult.error("修改任务失败,info表插入0条"); + } } catch (Exception e) { throw new ServiceException("数据库错误或供应商名称重复"); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml index 58dc69d4..ddfa77d7 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml @@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -14,12 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, model_id, name, url, dic_id, create_by, create_time from bm_file_info + select id, task_id, model_id, name, url, dic_id, create_by, create_time from bm_file_info