From 6cab2772f7689105ee9fe0afc6333cf29eb129e3 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 29 Oct 2024 14:09:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=89=A7=E7=85=A7?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../material/ma/service/impl/SupplierInfoServiceImpl.java | 6 ------
1 file changed, 6 deletions(-)
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);
});
From 9acc8d2c18460b6ba362f412fa974b550562bc73 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 29 Oct 2024 14:47:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=89=A7=E7=85=A7?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/bonus/material/basic/domain/BmFileInfo.java | 5 +++++
.../main/resources/mapper/material/ma/SupplierInfoMapper.xml | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
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/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}