From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index dd580f2..aa3a807 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -62,6 +62,18 @@
         <if test="status != null and status != ''">
             and t1.status = #{status}
         </if>
+        <if test="equipmentCategoryId != null and equipmentCategoryId != ''">
+            and t2.equipment_category_id = #{equipmentCategoryId}
+        </if>
+        <if test="factoryModelId != null and factoryModelId != ''">
+            and t2.factory_model_id = #{factoryModelId}
+        </if>
+        <if test="specificEquipment != null and specificEquipment != ''">
+            and t2.specific_equipment = #{specificEquipment}
+        </if>
+        <if test="teamId != null and teamId != ''">
+            and t1.team_id = #{teamId}
+        </if>
         and t1.repair_order_type = #{repairOrderType}
         order by t1.create_time desc
     </select>

--
Gitblit v1.9.3