diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java index 9252b4ce..16554335 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/SupplierInfo.java @@ -1,14 +1,12 @@ package com.bonus.material.ma.domain; import com.bonus.common.core.annotation.Excel; -import com.bonus.system.api.domain.SysFile; +import com.bonus.material.basic.domain.BmFileInfo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; -import org.springframework.web.multipart.MultipartFile; - import java.util.List; /** @@ -79,6 +77,6 @@ public class SupplierInfo extends BaseEntity { * 营业执照文件列表 */ @ApiModelProperty(value = "营业执照文件列表") - List businessLicenseFileList; + List businessLicenseFileList; } 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 bbd656cd..c7a93402 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 @@ -73,14 +73,14 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { return AjaxResult.success("新增任务成功,无营业执照附件"); } AtomicBoolean addFileInfoResult = new AtomicBoolean(false); - supplierInfo.getBusinessLicenseFileList().forEach(file -> { - BmFileInfo bmFileInfo = new BmFileInfo(); - if (file.getName() != null) { - bmFileInfo.setFileName(file.getName()); - } - bmFileInfo.setFileUrl(file.getUrl()); - // TODO: 此处需要修改为字典表中定义的Model模块id - bmFileInfo.setModelId(MODEL_ID); + supplierInfo.getBusinessLicenseFileList().forEach(bmFileInfo -> { +// BmFileInfo bmFileInfo = new BmFileInfo(); +// if (file.getName() != null) { +// bmFileInfo.setFileName(file.getName()); +// } +// bmFileInfo.setFileUrl(file.getUrl()); +// bmFileInfo.setModelId(MODEL_ID); + bmFileInfo.setModelId(supplierInfo.getSupplierId()); addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0); }); return addFileInfoResult.get() ? AjaxResult.success("新增任务成功") : AjaxResult.error("新增任务失败,附件表插入0条");