bonus
/
Material_Station_System
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-10-29 15:19:46 +08:00
parent 42b03bca30 9acc8d2c18
commit ad539782c1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java
View File

@ -24,6 +24,11 @@ public class BmFileInfo extends BaseEntity
/** 主键id */ /** 主键id */
private Long id; private Long id;
/** 任务id */
@Excel(name = "任务id")
@ApiModelProperty(value = "任务id")
private Long taskId;
/** 模块id */ /** 模块id */
@Excel(name = "模块id") @Excel(name = "模块id")
@ApiModelProperty(value = "模块id") @ApiModelProperty(value = "模块id")

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java
View File

@ -74,12 +74,6 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
} }
AtomicBoolean addFileInfoResult = new AtomicBoolean(false); AtomicBoolean addFileInfoResult = new AtomicBoolean(false);
supplierInfo.getBusinessLicenseFileList().forEach(bmFileInfo -> { 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()); bmFileInfo.setModelId(supplierInfo.getSupplierId());
addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0); addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0);
}); });

5
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml
View File

@ -103,11 +103,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<delete id="deleteSupplierInfoBySupplierId" parameterType="Long"> <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>
<delete id="deleteSupplierInfoBySupplierIds" parameterType="String"> <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=")"> <foreach item="supplierId" collection="array" open="(" separator="," close=")">
#{supplierId} #{supplierId}
</foreach> </foreach>