Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ad539782c1
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -103,11 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</update>
|
||||
|
||||
<delete id="deleteSupplierInfoBySupplierId" parameterType="Long">
|
||||
update ma_supplier_info set del_flag = 2 where supplier_id = #{supplierId}
|
||||
delete from ma_supplier_info where supplier_id = #{supplierId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteSupplierInfoBySupplierIds" parameterType="String">
|
||||
update ma_supplier_info set del_flag = 2 where supplier_id in
|
||||
delete from ma_supplier_info
|
||||
where supplier_id in
|
||||
<foreach item="supplierId" collection="array" open="(" separator="," close=")">
|
||||
#{supplierId}
|
||||
</foreach>
|
||||
|
|
|
|||
Loading…
Reference in New Issue