From be0f3ff1a521d0cf9e4934f2e295a7c177ac2ad8 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 30 Oct 2024 09:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=89=A7=E7=85=A7=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/basic/domain/BmFileInfo.java     |  4 ++--
 .../material/ma/domain/SupplierInfo.java      |  2 +-
 .../service/impl/SupplierInfoServiceImpl.java |  6 ++---
 .../material/basic/BmFileInfoMapper.xml       | 22 +++++++++----------
 4 files changed, 17 insertions(+), 17 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 565a163f..b3754eec 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
@@ -37,12 +37,12 @@ public class BmFileInfo extends BaseEntity
     /** 文件名称 */
     @Excel(name = "文件名称")
     @ApiModelProperty(value = "文件名称")
-    private String fileName;
+    private String name;
 
     /** 文件路径 */
     @Excel(name = "文件路径")
     @ApiModelProperty(value = "文件路径")
-    private String fileUrl;
+    private String url;
 
     /** 数据字典 */
     @Excel(name = "数据字典")
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 16554335..48ca9dba 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
@@ -77,6 +77,6 @@ public class SupplierInfo extends BaseEntity {
      * 营业执照文件列表
      */
     @ApiModelProperty(value = "营业执照文件列表")
-    List<BmFileInfo> businessLicenseFileList;
+    List<BmFileInfo> bmFileInfos;
 
 }
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 f057e0c9..7088ab17 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
@@ -49,7 +49,7 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
         bmFileInfo.setModelId(supplierInfo.getSupplierId());
         bmFileInfo.setDicId(MaterialConstants.FILE_TYPE_YINGYEZHIZHAO);
         List<BmFileInfo> fileInfos = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo);
-        supplierInfo.setBusinessLicenseFileList(fileInfos);
+        supplierInfo.setBmFileInfos(fileInfos);
         return supplierInfo;
     }
 
@@ -76,11 +76,11 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
             supplierInfo.setCreateTime(DateUtils.getNowDate());
             int insertedSupplierInfoResult = supplierInfoMapper.insertSupplierInfo(supplierInfo);
             if (insertedSupplierInfoResult > 0) {
-                if (CollectionUtils.isEmpty(supplierInfo.getBusinessLicenseFileList())) {
+                if (CollectionUtils.isEmpty(supplierInfo.getBmFileInfos())) {
                     return AjaxResult.success("新增任务成功,无营业执照附件");
                 }
                 AtomicBoolean addFileInfoResult = new AtomicBoolean(false);
-                supplierInfo.getBusinessLicenseFileList().forEach(bmFileInfo -> {
+                supplierInfo.getBmFileInfos().forEach(bmFileInfo -> {
                     bmFileInfo.setModelId(supplierInfo.getSupplierId());
                     addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0);
                 });
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml
index 9b67e9dc..58dc69d4 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmFileInfoMapper.xml
@@ -6,23 +6,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.bonus.material.basic.domain.BmFileInfo" id="BmFileInfoResult">
         <result property="id"    column="id"    />
         <result property="modelId"    column="model_id"    />
-        <result property="fileName"    column="file_name"    />
-        <result property="fileUrl"    column="file_url"    />
+        <result property="name"    column="name"    />
+        <result property="url"    column="url"    />
         <result property="dicId"    column="dic_id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectBmFileInfoVo">
-        select id, model_id, file_name, file_url, dic_id, create_by, create_time from bm_file_info
+        select id, model_id, name, url, dic_id, create_by, create_time from bm_file_info
     </sql>
 
     <select id="selectBmFileInfoList" parameterType="com.bonus.material.basic.domain.BmFileInfo" resultMap="BmFileInfoResult">
         <include refid="selectBmFileInfoVo"/>
         <where>  
             <if test="modelId != null "> and model_id = #{modelId}</if>
-            <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
-            <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="url != null  and url != ''"> and url = #{url}</if>
             <if test="dicId != null "> and dic_id = #{dicId}</if>
         </where>
     </select>
@@ -36,16 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into bm_file_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="modelId != null">model_id,</if>
-            <if test="fileName != null">file_name,</if>
-            <if test="fileUrl != null">file_url,</if>
+            <if test="name != null">name,</if>
+            <if test="url != null">url,</if>
             <if test="dicId != null">dic_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="modelId != null">#{modelId},</if>
-            <if test="fileName != null">#{fileName},</if>
-            <if test="fileUrl != null">#{fileUrl},</if>
+            <if test="name != null">#{name},</if>
+            <if test="url != null">#{url},</if>
             <if test="dicId != null">#{dicId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -56,8 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update bm_file_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="modelId != null">model_id = #{modelId},</if>
-            <if test="fileName != null">file_name = #{fileName},</if>
-            <if test="fileUrl != null">file_url = #{fileUrl},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="url != null">url = #{url},</if>
             <if test="dicId != null">dic_id = #{dicId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>