From bb400b2bcfa4754a7acab85f4b565ce8d5575ef3 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 16 Oct 2024 10:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0bmstoragelog=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/basic/domain/BmStorageLog.java    |  2 +-
 .../mapper/material/basic/BmStorageLogMapper.xml     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java
index 26b9f484..11a55b08 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmStorageLog.java
@@ -66,7 +66,7 @@ public class BmStorageLog extends BaseEntity
     /** 退库接收-维修数量 */
     @Excel(name = "退库接收-维修数量")
     @ApiModelProperty(value = "退库接收-维修数量")
-    private Long maintenanceNum;
+    private Long repairNum;
 
     /** 退库接收-报废数量 */
     @Excel(name = "退库接收-报废数量")
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml
index 65a70de0..2f547be5 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmStorageLogMapper.xml
@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="outNum"    column="out_num"    />
         <result property="backNum"    column="back_num"    />
         <result property="passNum"    column="pass_num"    />
-        <result property="maintenanceNum"    column="maintenance_num"    />
+        <result property="repairNum"    column="repair_num"    />
         <result property="scrapNum"    column="scrap_num"    />
         <result property="postStoreNum"    column="post_store_num"    />
         <result property="taskId"    column="task_id"    />
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBmStorageLogVo">
-        select id, model_title, method, type_id, pre_store_num, in_num, out_num, back_num, pass_num, maintenance_num, scrap_num, post_store_num, task_id, agreement_id, manage_type, type_name, type_model_name, result_code, result_msg, remark, status, json_result, creator, create_time, update_time from bm_storage_log
+        select id, model_title, method, type_id, pre_store_num, in_num, out_num, back_num, pass_num, repair_num, scrap_num, post_store_num, task_id, agreement_id, manage_type, type_name, type_model_name, result_code, result_msg, remark, status, json_result, creator, create_time, update_time from bm_storage_log
     </sql>
 
     <select id="selectBmStorageLogList" parameterType="com.bonus.material.basic.domain.BmStorageLog" resultMap="BmStorageLogResult">
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outNum != null "> and out_num = #{outNum}</if>
             <if test="backNum != null "> and back_num = #{backNum}</if>
             <if test="passNum != null "> and pass_num = #{passNum}</if>
-            <if test="maintenanceNum != null "> and maintenance_num = #{maintenanceNum}</if>
+            <if test="repairNum != null "> and repair_num = #{repairNum}</if>
             <if test="scrapNum != null "> and scrap_num = #{scrapNum}</if>
             <if test="postStoreNum != null "> and post_store_num = #{postStoreNum}</if>
             <if test="taskId != null  and taskId != ''"> and task_id = #{taskId}</if>
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outNum != null">out_num,</if>
             <if test="backNum != null">back_num,</if>
             <if test="passNum != null">pass_num,</if>
-            <if test="maintenanceNum != null">maintenance_num,</if>
+            <if test="repairNum != null">repair_num,</if>
             <if test="scrapNum != null">scrap_num,</if>
             <if test="postStoreNum != null">post_store_num,</if>
             <if test="taskId != null">task_id,</if>
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outNum != null">#{outNum},</if>
             <if test="backNum != null">#{backNum},</if>
             <if test="passNum != null">#{passNum},</if>
-            <if test="maintenanceNum != null">#{maintenanceNum},</if>
+            <if test="repairNum != null">#{repairNum},</if>
             <if test="scrapNum != null">#{scrapNum},</if>
             <if test="postStoreNum != null">#{postStoreNum},</if>
             <if test="taskId != null">#{taskId},</if>
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outNum != null">out_num = #{outNum},</if>
             <if test="backNum != null">back_num = #{backNum},</if>
             <if test="passNum != null">pass_num = #{passNum},</if>
-            <if test="maintenanceNum != null">maintenance_num = #{maintenanceNum},</if>
+            <if test="repairNum != null">repair_num = #{repairNum},</if>
             <if test="scrapNum != null">scrap_num = #{scrapNum},</if>
             <if test="postStoreNum != null">post_store_num = #{postStoreNum},</if>
             <if test="taskId != null">task_id = #{taskId},</if>