From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/device/DeviceRepairMapper.xml |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
new file mode 100644
index 0000000..0dd7b3a
--- /dev/null
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">
+
+    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
+        select dr.*,
+               dl.device_name,
+               dl.device_model
+        from device_repair dr
+        left join device_ledger dl on dr.device_ledger_id = dl.id
+        <where>
+            <if test="deviceRepairDto.deviceName != null">
+                and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
+            </if>
+            <if test="deviceRepairDto.deviceModel != null">
+                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
+            </if>
+        </where>
+    </select>
+
+</mapper>

--
Gitblit v1.9.3