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
main.deleted = 0
@@ -57,6 +58,11 @@
AND main.phone_number LIKE concat('%',#{entity.phoneNumber},'%')
+
+ AND main.phone_number = #{entity.phoneOrCar}
+ OR car.license_number = #{entity.phoneOrCar}
+ OR car.vin = #{entity.phoneOrCar}
+
GROUP BY main.id
ORDER BY main.create_time DESC
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
index 2e68139d..b03566c8 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
@@ -200,13 +200,16 @@ public class InspectionInfoServiceImpl extends ServiceImpl
- and so.so_status != '06'
+ and (so.so_status != '06' or so.so_status is null)
and (so.create_time between #{map.searchTimeArray[0]} and #{map.searchTimeArray[1]})
@@ -84,6 +85,9 @@
and (so.user_id = #{map.userId})
+
+ and so.main_id = #{map.mainId}
+
order by so.create_time desc