From 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 24 十月 2023 10:52:30 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml
index 553523b..80e6716 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRepairMapper.xml
@@ -5,30 +5,29 @@
     <!-- 鏍规嵁杞﹂棿灞傜骇鏌ヨ璁惧缁翠慨鍒楄〃 -->
     <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRepair">
         SELECT
-        mer.*
+            *
         FROM
-        MDC_EQUIPMENT_REPAIR mer
-        LEFT JOIN MDC_EQUIPMENT me ON mer.EQUIPMENT_ID = me.EQUIPMENT_ID
+            mdc_equipment_repair
         WHERE 1=1
         <if test="repair.equipmentName != null and repair.equipmentName != '' ">
-            AND mer.EQUIPMENT_NAME LIKE CONCAT(CONCAT('%',#{repair.equipmentName}),'%')
+            AND equipment_name LIKE CONCAT(CONCAT('%',#{repair.equipmentName}),'%')
         </if>
         <if test="repair.equipmentId != null and repair.equipmentId != '' ">
-            AND mer.EQUIPMENT_ID LIKE CONCAT(CONCAT('%',#{repair.equipmentId}),'%')
+            AND equipment_id LIKE CONCAT(CONCAT('%',#{repair.equipmentId}),'%')
         </if>
         <if test="repair.startTime != null ">
-            AND mer.END_TIME &gt;= #{ repair.startTime }
+            AND end_time &gt;= #{ repair.startTime }
         </if>
         <if test="repair.endTime != null ">
-            AND mer.START_TIME &lt;= #{ repair.endTime }
+            AND start_time &lt;= #{ repair.endTime }
         </if>
         <if test="repair.mdcSectionIds != null and repair.mdcSectionIds.size() > 0 ">
-            AND mer.EQUIPMENT_ID IN
+            AND equipment_id IN
             <foreach collection="repair.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
                 #{ id }
             </foreach>
         </if>
-        ORDER BY START_TIME ASC
+        ORDER BY start_time ASC,equipment_id ASC
     </select>
 
     <!--鏌ヨ鏌愭鏃堕棿鍐呮槸鍚︽湁缁翠慨浼戠彮鏁版嵁-->

--
Gitblit v1.9.3