From 34a369201aa32ca78a5531c7cfce8a2b8fd2bb00 Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Tue, 16 Dec 2025 13:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toolLedger/domain/ToolLedgerEntity.java   |  8 ++++-
 .../material/toolLedger/ToolLedgerMapper.xml  | 31 ++++++++++++++-----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java
index 2e7c0af..5deba83 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/toolLedger/domain/ToolLedgerEntity.java
@@ -43,10 +43,11 @@ public class ToolLedgerEntity implements Serializable {
     private String typeName;
 
     /**
-     * 管理方式：1-编码管理；2-数量管理（非空）
+     * 管理方式：0-编码管理；1-数量管理（非空）
      * 建议后续用枚举
      */
     private Integer manageMode;
+    private Integer type;
 
     /**
      * 装备原值（仅编码设备）
@@ -206,4 +207,9 @@ public class ToolLedgerEntity implements Serializable {
     private List<DevInfoPropertyVo> propertyVoList = new ArrayList<>();
 
     private String proName;
+
+    /**
+     * 关键字
+     */
+    private String keyWord;
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml
index ef381eb..7127396 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml
@@ -277,15 +277,31 @@
         WHERE tool_id = #{toolId}
     </select>
     <select id="getToolByTypeId" resultType="com.bonus.material.toolLedger.domain.ToolLedgerEntity">
+        SELECT a.toolCode,
+        a.totalNum,
+        a.typeName,
+        a.parentTypeName
+        FROM (
         SELECT tl.tool_code     AS toolCode,
-               tl.available_num AS totalNum,
-               tt.type_name     AS typeName,
-               tt1.type_name    AS parentTypeName
+        tl.available_num AS totalNum,
+        tt.type_name     AS typeName,
+        tt1.type_name    AS parentTypeName
         FROM tool_ledger tl
-                 INNER JOIN tool_type tt ON tt.type_id = tl.type_id
-                 INNER JOIN tool_type tt1 ON tt1.type_id = tt.parent_id
+        INNER JOIN tool_type tt ON tt.type_id = tl.type_id
+        INNER JOIN tool_type tt1 ON tt1.type_id = tt.parent_id
         WHERE tl.status = #{status}
-          AND tl.type_id = #{typeId}
+        AND tl.type_id = #{typeId}
+        AND tl.manage_mode = #{type}
+        ) a
+        WHERE 1=1
+        <if test="keyWord != null and keyWord != ''">
+            AND (
+            a.toolCode LIKE CONCAT('%', #{keyWord}, '%')
+            OR a.typeName LIKE CONCAT('%', #{keyWord}, '%')
+            OR a.parentTypeName LIKE CONCAT('%', #{keyWord}, '%')
+            )
+        </if>
+
     </select>
     <select id="getToolByPro" resultType="com.bonus.material.toolLedger.domain.ToolLedgerEntity">
         SELECT cdc.pro_name                                                                 AS proName,  -- 工程名称
@@ -314,7 +330,7 @@
           AND cdcd.dev_type_id = #{typeId}
           AND cdc.lease_type = #{status}
         GROUP BY cdc.pro_name, cdc.pro_code, cdcd.dev_code, cdcd.dev_type_id, tt.type_name
-        HAVING totalNum &gt; 0
+        HAVING totalNum > 0
         ORDER BY cdc.pro_name ASC, cdcd.dev_code ASC
     </select>
     <insert id="insertDevInfoProperties">
@@ -339,6 +355,7 @@
             <if test="originCost != null">origin_cost = #{originCost},</if>
             <if test="totalNum != null">total_num = #{totalNum},</if>
             <if test="availableNum != null">available_num = #{availableNum},</if>
+            <if test="identifyCode != null">identify_code=#{identifyCode},</if>
             <if test="inNum != null">in_num = #{inNum},</if>
             <if test="repairNum != null">repair_num = #{repairNum},</if>
             <if test="scrapNum != null">scrap_num = #{scrapNum},</if>