From a565d2131359ea9869a696b882a5d1b9d02667d7 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 11 Dec 2024 17:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/common/biz/domain/BmStorageLog.java | 64 +++++++++++++++++++
 .../material/basic/BmStorageLogMapper.xml     | 52 +++++++--------
 2 files changed, 88 insertions(+), 28 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java
index caff78f3..349f3ace 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmStorageLog.java
@@ -130,5 +130,69 @@ public class BmStorageLog extends BaseEntity
     @ApiModelProperty(value = "创建人")
     private String creator;
 
+    // Getters and Setters
+    public BigDecimal getPreStoreNum() {
+        return preStoreNum == null ? BigDecimal.ZERO : preStoreNum;
+    }
+
+    public void setPreStoreNum(BigDecimal preStoreNum) {
+        this.preStoreNum = preStoreNum;
+    }
+
+    public BigDecimal getInNum() {
+        return inNum == null ? BigDecimal.ZERO : inNum;
+    }
+
+    public void setInNum(BigDecimal inNum) {
+        this.inNum = inNum;
+    }
+
+    public BigDecimal getOutNum() {
+        return outNum == null ? BigDecimal.ZERO : outNum;
+    }
+
+    public void setOutNum(BigDecimal outNum) {
+        this.outNum = outNum;
+    }
+
+    public BigDecimal getBackNum() {
+        return backNum == null ? BigDecimal.ZERO : backNum;
+    }
+
+    public void setBackNum(BigDecimal backNum) {
+        this.backNum = backNum;
+    }
+
+    public BigDecimal getPassNum() {
+        return passNum == null ? BigDecimal.ZERO : passNum;
+    }
+
+    public void setPassNum(BigDecimal passNum) {
+        this.passNum = passNum;
+    }
+
+    public BigDecimal getRepairNum() {
+        return repairNum == null ? BigDecimal.ZERO : repairNum;
+    }
+
+    public void setRepairNum(BigDecimal repairNum) {
+        this.repairNum = repairNum;
+    }
+
+    public BigDecimal getScrapNum() {
+        return scrapNum == null ? BigDecimal.ZERO : scrapNum;
+    }
+
+    public void setScrapNum(BigDecimal scrapNum) {
+        this.scrapNum = scrapNum;
+    }
+
+    public BigDecimal getPostStoreNum() {
+        return postStoreNum == null ? BigDecimal.ZERO : postStoreNum;
+    }
+
+    public void setPostStoreNum(BigDecimal postStoreNum) {
+        this.postStoreNum = postStoreNum;
+    }
 
 }
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 bf8bcbf3..68246e82 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
@@ -34,39 +34,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectBmStorageLogVo">
         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.common.biz.domain.BmStorageLog" resultMap="BmStorageLogResult">
-        <include refid="selectBmStorageLogVo"/>
-        <where>  
-            <if test="modelTitle != null  and modelTitle != ''"> and model_title = #{modelTitle}</if>
-            <if test="method != null  and method != ''"> and method = #{method}</if>
-            <if test="typeId != null "> and type_id = #{typeId}</if>
-            <if test="preStoreNum != null "> and pre_store_num = #{preStoreNum}</if>
-            <if test="inNum != null "> and in_num = #{inNum}</if>
-            <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="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>
-            <if test="agreementId != null "> and agreement_id = #{agreementId}</if>
-            <if test="manageType != null  and manageType != ''"> and manage_type = #{manageType}</if>
-            <if test="typeName != null  and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
-            <if test="typeModelName != null  and typeModelName != ''"> and type_model_name like concat('%', #{typeModelName}, '%')</if>
-            <if test="resultCode != null "> and result_code = #{resultCode}</if>
-            <if test="resultMsg != null  and resultMsg != ''"> and result_msg = #{resultMsg}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="jsonResult != null  and jsonResult != ''"> and json_result = #{jsonResult}</if>
-            <if test="creator != null  and creator != ''"> and creator = #{creator}</if>
-        </where>
-    </select>
     
     <select id="selectBmStorageLogById" parameterType="Long" resultMap="BmStorageLogResult">
         <include refid="selectBmStorageLogVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="selectBmStorageLogList" resultType="com.bonus.common.biz.domain.BmStorageLog">
+        SELECT
+        id as id, model_title as modelTitle, method as method, type_id as typeId, pre_store_num as preStoreNum,
+        in_num as inNum, out_num as outNum, back_num as backNum,
+        pass_num as passNum, repair_num as repairNum,
+        scrap_num as scrapNum, post_store_num as postStoreNum, task_id as taskId, agreement_id as agreementId,
+        manage_type as manageType, type_name as typeName,
+        type_model_name as typeModelName, result_code as resultCode,
+        result_msg as resultMsg, remark as remark, status as status, json_result as jsonResult, creator as creator,
+        create_time as createTime
+        FROM
+        bm_storage_log
+        <where>
+            <if test="modelTitle != null and modelTitle != ''">
+                and model_title like concat('%', #{modelTitle}, '%')
+            </if>
+            <if test="typeName != null and typeName != ''">
+                and type_name like concat('%', #{typeName}, '%')
+            </if>
+        </where>
+        ORDER BY create_time DESC
+    </select>
+
     <insert id="insertBmStorageLog" parameterType="com.bonus.common.biz.domain.BmStorageLog" useGeneratedKeys="true" keyProperty="id">
         insert into bm_storage_log
         <trim prefix="(" suffix=")" suffixOverrides=",">