维修工单

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotMaintainMapper.xml

@@ -71,6 +71,7 @@
                 </foreach>
             </if>
         </where>
+        union all
         select CAST(create_time AS CHAR) as date, '委外维修'as type, device_code as deviceCode, device_name as deviceName, maintain_fee as cost from rq_iot_maintain a
         <where>
             a.deleted=0 and a.type='out'
@@ -246,9 +247,8 @@ select * from (
         UNION ALL
 
         SELECT
-        c.id,
+        c.id,'运行记录' AS type,
         '' AS taskId,
-        '运行记录' AS type,
         c.create_time AS createTime,
         -- 核心优化：status 数值转中文描述
         CASE