设备列表-导出excel 缺少绑定状态，excel表头顺序按列表展示

2025-09-26 09:32:42 +08:00
parent e124694e67
commit 3bdabb04e2
3 changed files with 17 additions and 4 deletions
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml
@ -29,9 +29,10 @@
                and da.treatment_state = #{bo.treatmentState}
            </if>
            <if test="bo.queryTime1 != null and  bo.queryTime2 != null ">
-                and da.start_time between #{bo.queryTime1} and #{bo.queryTime2}
+                and da.start_time BETWEEN #{bo.queryTime1} AND #{bo.queryTime2}
            </if>
        </where>
+        order by da.create_time DESC
    </select>