From cac8ac030fdd9764a254fa3b9948f103b3cb0400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 28 Oct 2024 16:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E4=B8=8A=E4=BC=A0=E7=94=A8=E6=88=B7=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/custom/vo/CustomerMainPageReqVO.java       | 2 ++
 .../src/main/resources/mapper/custom/CustomerMainMapper.xml | 6 ++++++
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java    | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java
index 2f61d4be..291f06d0 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java
@@ -13,5 +13,7 @@ import lombok.ToString;
 public class CustomerMainPageReqVO extends CustomerMain {
     /**系统标识*/
     private String systemCode;
+    /** 工单查询时条件*/
+    private String phoneOrCar;
 
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
index 80311869..91712365 100644
--- a/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
@@ -43,6 +43,7 @@
         base_customer_main main
         LEFT JOIN base_customer_item item ON main.id = item.cus_id AND item.deleted = 0
         LEFT JOIN dl_member_level memberLevel ON main.member_level_id = memberLevel.id
+        LEFT JOIN base_car_main car ON main.user_id = car.user_id
         <where>
             main.deleted = 0
             <if test="entity.cusName != null and entity.cusName != ''">
@@ -57,6 +58,11 @@
             <if test="entity.phoneNumber != null and entity.phoneNumber != ''">
                 AND main.phone_number LIKE concat('%',#{entity.phoneNumber},'%')
             </if>
+            <if test="entity.phoneOrCar != null and entity.phoneOrCar != ''">
+                AND main.phone_number = #{entity.phoneOrCar}
+                OR car.license_number = #{entity.phoneOrCar}
+                OR car.vin = #{entity.phoneOrCar}
+            </if>
         </where>
         GROUP BY main.id
         ORDER BY main.create_time DESC
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index fc7a20c9..ea7da9ae 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -271,7 +271,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         }
         repairOrderInfoService.saveOrderInfo(repairOrderInfo);
         //最后记录操作日志--创建工单
-        repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", null);
+        repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", ticketsRespVO.getImage());
         return ticketsRespVO;
     }