From 349e9066ad18d9834b1c02155ff90c475e0ae452 Mon Sep 17 00:00:00 2001
From: ljw <ljw@jszsyinfo.com>
Date: Sun, 4 Jan 2026 16:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=89=8C=E5=8F=B7=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=8F=8A=E8=BD=A6=E7=89=8C=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../money/controller/MoneyChangeDetailController.java  |  1 +
 .../money/pojo/entity/MoneyChangeDetailEntity.java     |  4 ++++
 .../resources/mapper/money/MoneyChangeDetailMapper.xml | 10 +++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java
index 933b6c0..d099cc7 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java
@@ -16,6 +16,7 @@ import java.util.List;
 
 /**
  * 资金明细
+ * @author ljw
  */
 @Slf4j
 @RestController
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java
index 9cf4510..fb2873c 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java
@@ -12,6 +12,7 @@ import java.time.LocalDateTime;
 
 /**
  * 资金变动明细
+ * @author ljw
  */
 @Getter
 @Setter
@@ -112,6 +113,9 @@ public class MoneyChangeDetailEntity {
     @TableField(exist = false)
     private String sn;
 
+    @TableField(exist = false)
+    private String licensePlate;
+
     /**
      * 开始时间（用于时间范围查询）
      */
diff --git a/njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml
index 8aef7a3..1a2fb34 100644
--- a/njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml
@@ -21,6 +21,7 @@
         mcd.modify_time,
         mcd.deleted,
         oi.sn,
+        bt.license_plate,
         CASE
         WHEN mcd.user_id IS NOT NULL THEN u.nickname
         WHEN mcd.company_id IS NOT NULL THEN bc.company_name
@@ -30,6 +31,7 @@
         LEFT JOIN sys_user u ON mcd.user_id = u.id
         LEFT JOIN biz_company bc ON mcd.company_id = bc.id
         LEFT JOIN order_info oi on oi.id = mcd.order_id
+        LEFT JOIN biz_truck bt ON bt.id = oi.truck_id
         <where>
             <if test="entity.nickname != null and entity.nickname != ''">
                 AND (u.nickname LIKE CONCAT('%', #{entity.nickname}, '%') or
@@ -38,6 +40,12 @@
             <if test="entity.moneyChangeCategory != null">
                 AND mcd.money_change_category = #{entity.moneyChangeCategory}
             </if>
+            <if test="entity.licensePlate != null">
+                AND bt.license_plate LIKE CONCAT('%', #{entity.licensePlate}, '%')
+            </if>
+            <if test="entity.sn != null">
+                AND oi.sn LIKE CONCAT('%', #{entity.sn}, '%')
+            </if>
         </where>
         ORDER BY mcd.modify_time DESC
     </select>
@@ -92,4 +100,4 @@
         ORDER BY
         mcd.create_time DESC
     </select>
-</mapper>
\ No newline at end of file
+</mapper>