diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java index 784dddad..565a163f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java @@ -24,6 +24,11 @@ public class BmFileInfo extends BaseEntity /** 主键id */ private Long id; + /** 任务id */ + @Excel(name = "任务id") + @ApiModelProperty(value = "任务id") + private Long taskId; + /** 模块id */ @Excel(name = "模块id") @ApiModelProperty(value = "模块id") 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 c7a93402..00db82c7 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 @@ -74,12 +74,6 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService { } AtomicBoolean addFileInfoResult = new AtomicBoolean(false); 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); }); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml index 05e30bb2..24faaeeb 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml @@ -103,11 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update ma_supplier_info set del_flag = 2 where supplier_id = #{supplierId} + delete from ma_supplier_info where supplier_id = #{supplierId} - update ma_supplier_info set del_flag = 2 where supplier_id in + delete from ma_supplier_info + where supplier_id in #{supplierId}