From 80834d20403b27b8936ba8c752dd9097e79b8c88 Mon Sep 17 00:00:00 2001
From: xuyuncong <3422692813@qq.com>
Date: Tue, 14 Oct 2025 17:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/custom/service/impl/CarMainServiceImpl.java   | 2 +-
 .../iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java  | 3 +++
 .../main/resources/mapper/stockOperate/DlRepairSoMapper.xml    | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
index 64766312..08336c1f 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
@@ -98,7 +98,7 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
         //todo 计算下次保养时间，下次保养里程，下次年检时间，保险到期时间
         baseMapper.insert(carMain);
         // 返回
-        return CommonResult.success("新增成功");
+        return CommonResult.success(carMain.getId());
     }
 
     /**
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java
index d0a27f01..f6536662 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/vo/DlRepairSoReqVO.java
@@ -25,4 +25,7 @@ public class DlRepairSoReqVO extends DlRepairSo {
 
     /**关联商品*/
     List<DlRepairSoi> soiList;
+
+    /**查询条件*/
+    private String query;
 }
diff --git a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
index 93546bc3..f2b6dff9 100644
--- a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
@@ -75,6 +75,9 @@
         <if test="map.searchTimeArray != null and map.searchTimeArray.length > 0">
             and (so.create_time between #{map.searchTimeArray[0]} and #{map.searchTimeArray[1]})
         </if>
+        <if test="map.query != null and map.query != ''">
+            and (so.so_no like concat('%', #{map.query}, '%') or so.remark like concat('%', #{map.query}, '%') or dtw.license_number like concat('%', #{map.query}, '%'))
+        </if>
         <if test="map.supplierId != null and map.supplierId != ''">
             and so.supplier_id = #{map.supplierId}
         </if>